1.3.5: Experimental .NET 6.0 with Microsoft.Data.SqlClient

Author: Thorium

docs/RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+### 1.3.5 - 20.12.2022
+* Experimental use of Microsoft.Data.SqlClient in .net6.0 and .netstandard2.1
+
 ### 1.3.4 - 04.12.2022
 * Always quote schema name with backticks in MySQL PR #777
 * Smaller runtime by removing unnecessary code

paket.dependencies

@@ -4,7 +4,7 @@ storage: none
 clitool dotnet-mono 0.5.6
 
 nuget FSharp.Core == 6.0.7
-nuget System.Data.SqlClient
+nuget System.Data.SqlClient framework: net461, net472, net480, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
 nuget NETStandard.Library.NETFramework storage: packages 
 nuget System.Data.OleDb
 nuget System.Runtime

paket.lock

@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("SQLProvider")>]
 [<assembly: AssemblyProductAttribute("SQLProvider")>]
 [<assembly: AssemblyDescriptionAttribute("Type providers for SQL database access.")>]
-[<assembly: AssemblyVersionAttribute("1.3.4")>]
-[<assembly: AssemblyFileVersionAttribute("1.3.4")>]
+[<assembly: AssemblyVersionAttribute("1.3.5")>]
+[<assembly: AssemblyFileVersionAttribute("1.3.5")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SQLProvider"
     let [<Literal>] AssemblyProduct = "SQLProvider"
     let [<Literal>] AssemblyDescription = "Type providers for SQL database access."
-    let [<Literal>] AssemblyVersion = "1.3.4"
-    let [<Literal>] AssemblyFileVersion = "1.3.4"
+    let [<Literal>] AssemblyVersion = "1.3.5"
+    let [<Literal>] AssemblyFileVersion = "1.3.5"

src/Common/AssemblyInfo.fs

@@ -3,8 +3,7 @@
   <Import Project="..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net472;net48</TargetFrameworks>
-	<!--TargetFrameworks>netstandard2.0;netcoreapp3.1;net48;net6.0</TargetFrameworks-->
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net472;net6.0</TargetFrameworks>
     <DefineConstants>NETSTANDARD;NO_GENERATIVE;DESIGNTIME</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -18,6 +17,9 @@
     <Optimize>true</Optimize>
     <Tailcalls>true</Tailcalls>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
+    <DefineConstants>$(DefineConstants);MICROSOFTSQL</DefineConstants>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\paket-files\sourcefiles\fsprojects\FSharp.TypeProviders.SDK\src\ProvidedTypes.fsi">
       <Paket>True</Paket>
@@ -125,10 +127,11 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <!--
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    </PackageReference>-->
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>

src/SQLProvider.DesignTime/SQLProvider.DesignTime.fsproj

@@ -7,11 +7,11 @@ System.IO
 System.Console
 System.Reflection
 System.Reflection.TypeExtensions
-System.Data.SqlClient
+System.Data.SqlClient framework: net461, net472, net480, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
 System.Data.Common
 System.Data.Odbc
 System.Data.OleDb
-Microsoft.Data.SqlClient
+Microsoft.Data.SqlClient framework: net6.0, netstandard2.1
 group SourceFiles
 File:ProvidedTypes.fsi
 File:ProvidedTypes.fs

src/SQLProvider.DesignTime/paket.references

@@ -4,7 +4,11 @@ namespace FSharp.Data.Sql.Providers
 open System
 open System.Collections.Concurrent
 open System.Data
+#if MICROSOFTSQL
+open Microsoft.Data.SqlClient
+#else
 open System.Data.SqlClient
+#endif
 open System.IO
 open System.Reflection
 open System.Text

src/SQLProvider.Runtime/Providers.MsSqlServer.Ssdt.fs

@@ -4,7 +4,11 @@ open System
 open System.Collections.Concurrent
 open System.Collections.Generic
 open System.Data
+#if MICROSOFTSQL
+open Microsoft.Data.SqlClient
+#else
 open System.Data.SqlClient
+#endif
 open FSharp.Data.Sql
 open FSharp.Data.Sql.Transactions
 open FSharp.Data.Sql.Schema

src/SQLProvider.Runtime/Providers.MsSqlServer.fs

@@ -5,7 +5,7 @@
   <Import Project="..\..\netfx.props" />
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net48</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net472;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DefineConstants>TP_RUNTIME;NETSTANDARD;NO_GENERATIVE</DefineConstants>
@@ -35,6 +35,9 @@
     <Optimize>true</Optimize>
     <Tailcalls>true</Tailcalls>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
+      <DefineConstants>$(DefineConstants);MICROSOFTSQL</DefineConstants>
+  </PropertyGroup>
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
   <ItemGroup>
     <Compile Include="..\Common\AssemblyInfo.fs">
@@ -73,19 +76,23 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <!--
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net48" Version="1.0.0">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
+    </PackageReference>-->
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>
-  <Target Name="BeforeBuild">
-    <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Restore" />
-    <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netcoreapp3.1" />
+  <Target Name="BeforeBuild" Condition=" '$(TargetFramework)' != 'net6.0' And '$(TargetFramework)' != 'netstandard2.1' ">
+    <!--<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Restore" />-->
+    <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFrameworks=netcoreapp3.1" />
     <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" />
-    <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net48" />
+    <!--<MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net48" />-->
     <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net472" />
   </Target>
+  <Target Name="BeforeBuild" Condition=" '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'netstandard2.1' ">
+      <MSBuild Projects="..\SQLProvider.DesignTime\SQLProvider.DesignTime.fsproj" Targets="Build" Properties="Configuration=$(Configuration);TargetFramework=net6.0" />
+  </Target>
   <Target Name="AfterBuild">
   </Target>
   <ItemGroup Condition="'$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48' ">

src/SQLProvider.Runtime/SQLProvider.Runtime.fsproj

@@ -7,10 +7,11 @@ System.IO
 System.Console
 System.Reflection
 System.Reflection.TypeExtensions
-System.Data.SqlClient
+System.Data.SqlClient framework: net461, net472, net480, netstandard2.0, netstandard2.1, netcoreapp2.1, netcoreapp3.1
 System.Data.Common
 System.Data.Odbc
 System.Data.OleDb
+Microsoft.Data.SqlClient framework: net6.0, netstandard2.1
 
 group SourceFiles
       File:ExpressionOptimizer.fs

src/SQLProvider.Runtime/paket.references

@@ -25,13 +25,16 @@ description
     Type providers for SQL database access.
 files
     ../../bin/net472/FSharp.Data.SqlProvider.* ==> lib/net472
+    ../../bin/net6.0/FSharp.Data.SqlProvider.* ==> lib/net6.0
     ../../bin/netstandard2.0/FSharp.Data.SQLProvider.* ==> lib/netstandard2.0
+    ../../bin/netstandard2.1/FSharp.Data.SQLProvider.* ==> lib/netstandard2.1
+    ../../bin/typeproviders/fsharp41/net6.0/*.dll ==> typeproviders/fsharp41/net6.0
     ../../bin/typeproviders/fsharp41/netstandard2.0/*.dll ==> typeproviders/fsharp41/netstandard2.0
     ../../bin/typeproviders/fsharp41/netcoreapp3.1/*.dll ==> typeproviders/fsharp41/netcoreapp3.1
     ../../bin/typeproviders/fsharp41/net472/*.dll ==> typeproviders/fsharp41/net472
+    ../../bin/typeproviders/fsharp41/net6.0/*.dll ==> typeproviders/fsharp41/net6.0
 references
     FSharp.Data.SqlProvider.dll
 dependencies
     FSharp.Core >= 6.0.7
     Newtonsoft.Json >= 13.0.1
-    System.Net.Http >= 4.3.4