Skip to content

Commit 03d00eb

Browse files
smoothdevelopersmoothdeveloper
committed
adjust tests to new namespaces/set the compile constant in fsproj
also * adjust samples references (tighten references to fsharp.core & newtonsoft.json) * set storage none on most of paket.dependencies groups minimize diff
1 parent 2bd6cd2 commit 03d00eb

31 files changed

+537
-406
lines changed

‎paket.dependencies‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source https://www.nuget.org/api/v2/
22
generate_load_scripts: on
3-
3+
storage: none
44
github fsprojects/FSharp.TypeProviders.SDK:28a24a69ada68ebd1ad25226634f4608e4875493 src/ProvidedTypes.fs
55
github fsprojects/FSharp.TypeProviders.SDK:28a24a69ada68ebd1ad25226634f4608e4875493 src/ProvidedTypes.fsi
66
github fsprojects/FSharp.TypeProviders.SDK:28a24a69ada68ebd1ad25226634f4608e4875493 src/ProvidedTypesTesting.fs
@@ -9,6 +9,7 @@ group Build
99
source https://www.nuget.org/api/v2/
1010
framework: >= net451
1111
generate_load_scripts: on
12+
storage: none
1213

1314
nuget FAKE = 5.8.4
1415
nuget Fake.Lib = 5.8.4
@@ -22,7 +23,8 @@ group Build
2223
group DesignTime
2324
source https://www.nuget.org/api/v2/
2425
framework: >= net461,netstandard20
25-
26+
storage: none
27+
2628
nuget System.Configuration.ConfigurationManager
2729
nuget System.Data.Common
2830
nuget System.Data.SqlClient
@@ -34,6 +36,7 @@ group DesignTime
3436
group Test
3537
source https://www.nuget.org/api/v2/
3638
framework: net461, netcoreapp2.0
39+
storage: none
3740

3841
nuget FSharp.Core = 4.5.2 redirects:force
3942
nuget System.Data.SqlClient
@@ -47,12 +50,14 @@ group Test
4750
group Net40
4851
source https://www.nuget.org/api/v2/
4952
framework: net40
53+
storage: none
5054

5155
nuget FSharp.Core = 4.1.18
5256

5357
group TestProjects
5458
source https://www.nuget.org/api/v2/
5559
framework: >= net40, netcoreapp2.0, netstandard2.0
60+
storage: none
5661

5762
nuget FSharp.Core = 4.3.4
5863

@@ -62,13 +67,16 @@ group TestProjects
6267
group Samples
6368
source https://www.nuget.org/api/v2/
6469
framework: >= net40
65-
66-
nuget FSharp.Core = 4.5.2
70+
redirects: on
71+
72+
nuget FSharp.Core = 4.5.2 redirects: force
6773

6874
nuget Microsoft.AspNet.WebApi
6975
nuget Microsoft.AspNet.WebApi.Client
7076
nuget Microsoft.AspNet.WebApi.Core
7177
nuget Microsoft.AspNet.WebApi.WebHost
78+
nuget Microsoft.SqlServer.Types
7279

73-
nuget Newtonsoft.Json
80+
nuget Newtonsoft.Json redirects: force
7481
nuget FSharp.Data.SqlClient
82+

‎paket.lock‎

Lines changed: 380 additions & 364 deletions
Large diffs are not rendered by default.

‎src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<NoWarn>101</NoWarn>
1010
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
1111
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
12-
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY</DefineConstants>
12+
<DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;WITH_LEGACY_NAMESPACE</DefineConstants>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<PackageReference Include="FSharp.Core" Version="4.1.18" Condition="'$(TargetFramework)' == 'net40'" />

‎src/SqlClient.Samples/WebApi.Controllers/WebApi.Controllers.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>Library</OutputType>
1010
<RootNamespace>WebApi.Controllers</RootNamespace>
1111
<AssemblyName>WebApi.Controllers</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
1414
<Name>WebApi.Controllers</Name>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>

‎src/SqlClient.Samples/WebApi/WebApi.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@
4242
<WarningLevel>4</WarningLevel>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="FSharp.Core, Version=4.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
46-
<Private>True</Private>
47-
</Reference>
4845
<Reference Include="System" />
4946
<Reference Include="System.Data" />
5047
<Reference Include="System.Data.DataSetExtensions" />
@@ -116,6 +113,17 @@
116113
</Target>
117114
-->
118115
<Import Project="..\..\..\.paket\paket.targets" />
116+
<Choose>
117+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
118+
<ItemGroup>
119+
<Reference Include="FSharp.Core">
120+
<HintPath>..\..\..\packages\samples\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
121+
<Private>True</Private>
122+
<Paket>True</Paket>
123+
</Reference>
124+
</ItemGroup>
125+
</When>
126+
</Choose>
119127
<Choose>
120128
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
121129
<ItemGroup>

‎src/SqlClient.Samples/WebApi/paket.references‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
group Samples
2+
FSharp.Core
23
FSharp.Data.SqlClient
34
Microsoft.AspNet.WebApi
45
Microsoft.AspNet.WebApi.Client

‎src/SqlClient.Samples/WebApi/web.config‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
<compilation debug="true" targetFramework="4.5.2" />
1616
<httpRuntime targetFramework="4.5" />
1717
</system.web>
18-
<runtime>
19-
20-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
21-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
22-
<dependentAssembly>
23-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
24-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.5.0" />
25-
</dependentAssembly>
26-
</assemblyBinding>
27-
</assemblyBinding></runtime>
18+
2819
<system.webServer>
2920
<handlers>
3021
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
@@ -33,4 +24,15 @@
3324
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
3425
</handlers>
3526
</system.webServer>
36-
</configuration>
27+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
28+
<dependentAssembly>
29+
<Paket>True</Paket>
30+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
32+
</dependentAssembly>
33+
<dependentAssembly>
34+
<Paket>True</Paket>
35+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
36+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="12.0.0.0" />
37+
</dependentAssembly>
38+
</assemblyBinding></runtime></configuration>

‎src/SqlClient.Samples/WpfDataBinding/App.config‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,15 @@
77
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
88
</startup>
99

10-
</configuration>
10+
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
11+
<dependentAssembly>
12+
<Paket>True</Paket>
13+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
14+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.5.0.0" />
15+
</dependentAssembly>
16+
<dependentAssembly>
17+
<Paket>True</Paket>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="12.0.0.0" />
20+
</dependentAssembly>
21+
</assemblyBinding></runtime></configuration>

‎src/SqlClient.Samples/WpfDataBinding/Program.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ open System.Windows
88
open System.Windows.Controls
99
open System.Data.SqlClient
1010

11-
open FSharp.Data
11+
open FSharp.Data.SqlClient
1212

1313
[<Literal>]
1414
let queryTableSql = "select top 5 AddressID, AddressLine1, City, SpatialLocation from Person.Address where AddressLine1 like @startsWith"

‎src/SqlClient.Samples/WpfDataBinding/WpfDataBinding.fsproj‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<OutputType>WinExe</OutputType>
1010
<RootNamespace>DataBinding</RootNamespace>
1111
<AssemblyName>DataBinding</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1313
<Name>WpfDataBinding</Name>
1414
<TargetFrameworkProfile>
1515
</TargetFrameworkProfile>
@@ -56,6 +56,12 @@
5656
</Choose>
5757
<Import Project="$(FSharpTargetsPath)" Condition="Exists('$(FSharpTargetsPath)')" />
5858
<ItemGroup>
59+
<Content Include="SqlServerTypes\Loader.cs">
60+
<Paket>True</Paket>
61+
</Content>
62+
<Content Include="SqlServerTypes\readme.htm">
63+
<Paket>True</Paket>
64+
</Content>
5965
<Resource Include="MainWindow.xaml">
6066
<Generator>MSBuild:Compile</Generator>
6167
<SubType>Designer</SubType>
@@ -65,7 +71,6 @@
6571
<Content Include="paket.references" />
6672
</ItemGroup>
6773
<ItemGroup>
68-
<Reference Include="Microsoft.SqlServer.Types, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91" />
6974
<Reference Include="mscorlib" />
7075
<Reference Include="PresentationUI" />
7176
<Reference Include="System" />
@@ -118,4 +123,15 @@
118123
</ItemGroup>
119124
</When>
120125
</Choose>
126+
<Choose>
127+
<When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.0' Or $(TargetFrameworkVersion) == 'v4.0.3' Or $(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
128+
<ItemGroup>
129+
<Reference Include="Microsoft.SqlServer.Types">
130+
<HintPath>..\..\..\packages\samples\Microsoft.SqlServer.Types\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
131+
<Private>True</Private>
132+
<Paket>True</Paket>
133+
</Reference>
134+
</ItemGroup>
135+
</When>
136+
</Choose>
121137
</Project>

0 commit comments

Comments
 (0)