Skip to content

Commit cedf1aa

Browse files
Thoriumsmoothdeveloper
authored andcommitted
Made provider to compile and work with .NET 8.0
1 parent 92b65a9 commit cedf1aa

File tree

9 files changed

+27
-13
lines changed

9 files changed

+27
-13
lines changed

paket.dependencies

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ group Docs
4040

4141
group DesignTime
4242
source https://www.nuget.org/api/v2/
43-
framework: >= net461, >= netstandard20
43+
framework: >= net461, >= netstandard20, net8.0
4444
storage: none
4545

4646
nuget System.Configuration.ConfigurationManager
@@ -72,7 +72,7 @@ group Net40
7272

7373
group TestProjects
7474
source https://www.nuget.org/api/v2/
75-
framework: >= net40, >= netcoreapp2.0, >= netstandard2.0
75+
framework: >= net40, >= netcoreapp2.0, >= netstandard2.0, net8.0
7676
storage: none
7777

7878
nuget FSharp.Core = 4.3.4
@@ -82,7 +82,7 @@ group TestProjects
8282

8383
group Samples
8484
source https://www.nuget.org/api/v2/
85-
framework: >= net40, >= netcoreapp2.0, >= netstandard2.0
85+
framework: >= net40, >= netcoreapp2.0, >= netstandard2.0, net8.0
8686
redirects: on
8787

8888
nuget FSharp.Core = 4.5.2 redirects: force

src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="..\..\netfx.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net461;netstandard2.0;net8.0</TargetFrameworks>
66
<AssemblyName>FSharp.Data.SqlClient.DesignTime</AssemblyName>
77
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
9+
<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
10+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
911
<NoWarn>$(NoWarn);101</NoWarn>
1012

1113
<!--

src/SqlClient.TestProjects/Lib/Lib.fsproj

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\fsc.props" />
44
<Import Project="..\..\..\netfx.props" />
55
<PropertyGroup>
6-
<TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks>net471;netstandard2.0;net8.0</TargetFrameworks>
77
<AssemblyName>Lib</AssemblyName>
88
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -19,6 +19,9 @@
1919
</ItemGroup>
2020
<ItemGroup>
2121
<Reference Include="netstandard" />
22+
<Reference Condition="'$(TargetFramework)' == 'net8.0'" Include="FSharp.Data.SqlClient">
23+
<HintPath>..\..\..\bin\net8.0\FSharp.Data.SqlClient.dll</HintPath>
24+
</Reference>
2225
<Reference Condition="'$(TargetFramework)' == 'netstandard2.0'" Include="FSharp.Data.SqlClient">
2326
<HintPath>..\..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
2427
</Reference>

src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/SqlClient.Tests.NetCoreApp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\..\fsc.props" />
44
<PropertyGroup>
55
<OutputType>Exe</OutputType>
6-
<TargetFramework>netcoreapp2.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
88
</PropertyGroup>
99
<ItemGroup>

src/SqlClient/SqlClient.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<Import Project="..\..\netfx.props" />
44
<PropertyGroup>
5-
<TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
5+
<TargetFrameworks>net40;netstandard2.0;net8.0</TargetFrameworks>
66
<AssemblyName>FSharp.Data.SqlClient</AssemblyName>
77
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
88
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>

tests/SqlClient.DesignTime.Tests/SqlClient.DesignTime.Tests.fsproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--<Import Project="..\..\fsc.props" />-->
44
<!--<Import Project="..\..\netfx.props" />-->
55
<PropertyGroup>
6-
<TargetFramework>net462</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<AssemblyName>SqlClient.DesignTime.Tests</AssemblyName>
88
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -16,7 +16,8 @@
1616
</ItemGroup>
1717
<ItemGroup>
1818
<Reference Include="FSharp.Data.SqlClient.DesignTime">
19-
<HintPath>..\..\bin\typeproviders\fsharp41\net461\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
19+
<!--<HintPath>..\..\bin\typeproviders\fsharp41\net461\FSharp.Data.SqlClient.DesignTime.dll</HintPath>-->
20+
<HintPath>..\..\bin\typeproviders\fsharp41\net8.0\FSharp.Data.SqlClient.DesignTime.dll</HintPath>
2021
</Reference>
2122
</ItemGroup>
2223
<Import Project="..\..\.paket\Paket.Restore.targets" />

tests/SqlClient.DesignTime.Tests/app.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<assemblyIdentity name="xunit" publicKeyToken="8d05b1bb7a6fdb6c" culture="neutral" />
1717
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="1.9.2.1705" />
1818
</dependentAssembly>
19+
<dependentAssembly>
20+
<Paket>True</Paket>
21+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
22+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
23+
</dependentAssembly>
1924
</assemblyBinding></runtime>
2025
<!--<connectionStrings configSource="connectionStrings.Azure.config"/>-->
2126
<connectionStrings>

tests/SqlClient.SqlServerTypes.Tests/App.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<Paket>True</Paket>
15-
<assemblyIdentity name="Microsoft.SqlServer.Types" publicKeyToken="89845dcd8080cc91" culture="neutral" />
16-
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="12.0.0.0" />
15+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
1717
</dependentAssembly>
1818
</assemblyBinding></runtime></configuration>

tests/SqlClient.Tests/SqlClient.Tests.fsproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!--<Import Project="..\..\fsc.props" />-->
44
<!--<Import Project="..\..\netfx.props" />-->
55
<PropertyGroup>
6-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net462;netcoreapp3.1</TargetFrameworks>
77
<AssemblyName>SqlClient.Tests</AssemblyName>
88
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
99
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -52,9 +52,12 @@
5252
</Content>
5353
</ItemGroup>
5454
<ItemGroup>
55-
<Reference Include="FSharp.Data.SqlClient">
55+
<Reference Condition="'$(TargetFramework)' != 'net8.0'" Include="FSharp.Data.SqlClient">
5656
<HintPath>..\..\bin\netstandard2.0\FSharp.Data.SqlClient.dll</HintPath>
5757
</Reference>
58+
<Reference Condition="'$(TargetFramework)' == 'net8.0'" Include="FSharp.Data.SqlClient">
59+
<HintPath>..\..\bin\net8.0\FSharp.Data.SqlClient.dll</HintPath>
60+
</Reference>
5861
<Reference Include="System.Transactions" />
5962
</ItemGroup>
6063
<Target Name="CopyCustomContent" AfterTargets="AfterBuild">

0 commit comments

Comments
 (0)