Skip to content

Commit de59ef2

Browse files
smoothdevelopersmoothdeveloper
committed
* update typeprovider user project files to new sdk
* define IsTestProject in test projects for "dotnet test" (need some more config to work) * use nuget references for non rezoom assemblies in type provider user projects
1 parent a48a9c7 commit de59ef2

File tree

8 files changed

+67
-1902
lines changed

8 files changed

+67
-1902
lines changed

‎src/Rezoom.SQL.Provider/Rezoom.SQL.Provider.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net45;</TargetFrameworks>
4+
<TargetFrameworks>net45</TargetFrameworks>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
</PropertyGroup>
77
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎src/Rezoom.SQL.Test/Rezoom.SQL.Test.fsproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>net45;</TargetFrameworks>
4+
<TargetFrameworks>net45</TargetFrameworks>
5+
<IsTestProject>true</IsTestProject>
56
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
67
</PropertyGroup>
78
<ItemGroup>
@@ -37,6 +38,7 @@
3738
<Content Include="paket.references" />
3839
</ItemGroup>
3940
<ItemGroup>
41+
<ProjectReference Include="..\Rezoom.SQL.Mapping\Rezoom.SQL.Mapping.fsproj" />
4042
<ProjectReference Include="..\Rezoom.SQL.Compiler\Rezoom.SQL.Compiler.fsproj" />
4143
<Reference Include="mscorlib" />
4244
<Reference Include="System" />
@@ -45,7 +47,6 @@
4547
<Reference Include="System.Core" />
4648
<Reference Include="System.Data" />
4749
<Reference Include="System.Numerics" />
48-
<ProjectReference Include="..\Rezoom.SQL.Mapping\Rezoom.SQL.Mapping.fsproj" />
4950
</ItemGroup>
5051
<Import Project="..\..\.paket\Paket.Restore.targets" />
5152
</Project>

‎src/TypeProviderUsers/TypeProviderUser.Postgres/App.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,31 @@
1414
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
1515
</startup>
1616
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
17+
<dependentAssembly>
18+
<Paket>True</Paket>
19+
<assemblyIdentity name="FParsec" publicKeyToken="40ccfc0a09edbb5d" culture="neutral" />
20+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.0.0" />
21+
</dependentAssembly>
22+
<dependentAssembly>
23+
<Paket>True</Paket>
24+
<assemblyIdentity name="FParsec-Pipes" publicKeyToken="a7813e45d445015c" culture="neutral" />
25+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="0.4.0.0" />
26+
</dependentAssembly>
27+
<dependentAssembly>
28+
<Paket>True</Paket>
29+
<assemblyIdentity name="FParsecCS" publicKeyToken="40ccfc0a09edbb5d" culture="neutral" />
30+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.0.0" />
31+
</dependentAssembly>
1732
<dependentAssembly>
1833
<Paket>True</Paket>
1934
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2035
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
2136
</dependentAssembly>
37+
<dependentAssembly>
38+
<Paket>True</Paket>
39+
<assemblyIdentity name="LicenseToCIL" publicKeyToken="a7813e45d445015c" culture="neutral" />
40+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="0.3.0.39451" />
41+
</dependentAssembly>
2242
<dependentAssembly>
2343
<Paket>True</Paket>
2444
<assemblyIdentity name="Npgsql" publicKeyToken="5d8b90d52f46fda7" culture="neutral" />

‎src/TypeProviderUsers/TypeProviderUser.Postgres/TypeProviderUser.Postgres.fsproj‎

Lines changed: 9 additions & 942 deletions
Large diffs are not rendered by default.

‎src/TypeProviderUsers/TypeProviderUser.Postgres/paket.references‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
FParsec-Pipes
12
FSharp.Core
23
FsUnit
34
Npgsql
5+
LicenseToCIL

‎src/TypeProviderUsers/TypeProviderUser.SQLite/App.config‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,31 @@
1111
</DbProviderFactories>
1212
</system.data>
1313
<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
14+
<dependentAssembly>
15+
<Paket>True</Paket>
16+
<assemblyIdentity name="FParsec" publicKeyToken="40ccfc0a09edbb5d" culture="neutral" />
17+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.0.0" />
18+
</dependentAssembly>
19+
<dependentAssembly>
20+
<Paket>True</Paket>
21+
<assemblyIdentity name="FParsec-Pipes" publicKeyToken="a7813e45d445015c" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="0.4.0.0" />
23+
</dependentAssembly>
24+
<dependentAssembly>
25+
<Paket>True</Paket>
26+
<assemblyIdentity name="FParsecCS" publicKeyToken="40ccfc0a09edbb5d" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.0.0.0" />
28+
</dependentAssembly>
1429
<dependentAssembly>
1530
<Paket>True</Paket>
1631
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
1732
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
1833
</dependentAssembly>
34+
<dependentAssembly>
35+
<Paket>True</Paket>
36+
<assemblyIdentity name="LicenseToCIL" publicKeyToken="a7813e45d445015c" culture="neutral" />
37+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="0.3.0.39451" />
38+
</dependentAssembly>
1939
<dependentAssembly>
2040
<Paket>True</Paket>
2141
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />

0 commit comments

Comments
 (0)