add windows .NET Core support

Author: dsyme

.github/workflows/dotnet-core.yml

@@ -2,13 +2,12 @@ name: FSharp.Data.SqlClient 'Actions' CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, fb ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, fb ]
 
 jobs:
-  build:
-
+  build-linux:
     runs-on: ubuntu-latest
 
     services:
@@ -60,3 +59,45 @@ jobs:
 
     - name: Build
       run: ./build.sh
+
+  build-windows:
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 9.0.x
+
+    - name: Install SQL Server
+      uses: potatoqualitee/mssqlsuite@v1.7
+      with:
+        install: sqlengine
+        sa-password: YourStrong@Passw0rd
+
+    - name: Restore AdventureWorks2012 from backup
+      shell: pwsh
+      run: |
+        $BAK = "$env:TEMP\AdventureWorks2012.bak"
+        Write-Host "Downloading AdventureWorks2012.bak..."
+        Invoke-WebRequest -Uri "https://github.com/Microsoft/sql-server-samples/releases/download/adventureworks/AdventureWorks2012.bak" -OutFile $BAK
+
+        # Get the default data path from SQL Server
+        $dataPath = Invoke-Sqlcmd -ServerInstance "localhost" -Username "SA" -Password "YourStrong@Passw0rd" -TrustServerCertificate -Query "SELECT SERVERPROPERTY('InstanceDefaultDataPath') AS DataPath" | Select-Object -ExpandProperty DataPath
+
+        Write-Host "Restoring AdventureWorks2012 to $dataPath ..."
+        $restoreQuery = @"
+        RESTORE DATABASE [AdventureWorks2012]
+        FROM DISK = N'$BAK'
+        WITH MOVE 'AdventureWorks2012'     TO '${dataPath}AdventureWorks2012_Data.mdf',
+             MOVE 'AdventureWorks2012_log' TO '${dataPath}AdventureWorks2012_Log.ldf',
+             REPLACE, NOUNLOAD, STATS = 5
+        "@
+        Invoke-Sqlcmd -ServerInstance "localhost" -Username "SA" -Password "YourStrong@Passw0rd" -TrustServerCertificate -Query $restoreQuery -QueryTimeout 120
+
+        echo "GITHUB_ACTION_SQL_SERVER_CONNECTION_STRING=Data Source=localhost,1433;Initial Catalog=AdventureWorks2012;User ID=SA;Password=YourStrong@Passw0rd;TrustServerCertificate=True;" >> $env:GITHUB_ENV
+
+    - name: Build
+      run: .\build.cmd

src/SqlClient.DesignTime/SingleRootTypeProvider.fs

@@ -3,6 +3,7 @@
 open FSharp.Data.SqlClient
 open Microsoft.FSharp.Core.CompilerServices
 open System.Reflection
+open System.Runtime.InteropServices
 open System
 
 [<AbstractClass>]
@@ -17,6 +18,31 @@ type SingleRootTypeProvider(config: TypeProviderConfig, providerName, parameters
             addDefaultProbingLocation = true
         )
 
+    // On Windows, Microsoft.Data.SqlClient loads the native SNI library via P/Invoke.
+    // When the type provider runs inside the F# compiler, the native DLL search path
+    // may not include the TP output directory. Register a resolver so the runtime can
+    // find Microsoft.Data.SqlClient.SNI.dll next to the TP assembly.
+#if USE_SYSTEM_DATA_COMMON_DBPROVIDERFACTORIES
+    static do
+        if RuntimeInformation.IsOSPlatform(OSPlatform.Windows) then
+            let tpDir =
+                System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location)
+
+            let handler =
+                System.Runtime.InteropServices.DllImportResolver(fun libraryName assembly searchPath ->
+                    if libraryName = "Microsoft.Data.SqlClient.SNI.dll" then
+                        let candidate = System.IO.Path.Combine(tpDir, "Microsoft.Data.SqlClient.SNI.dll")
+
+                        if System.IO.File.Exists(candidate) then
+                            NativeLibrary.Load(candidate)
+                        else
+                            System.IntPtr.Zero
+                    else
+                        System.IntPtr.Zero)
+
+            NativeLibrary.SetDllImportResolver(typeof<Microsoft.Data.SqlClient.SqlConnection>.Assembly, handler)
+#endif
+
     let cache = new Cache<ProvidedTypeDefinition>()
 
     do

src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj

@@ -88,21 +88,31 @@
       <_TPRid Condition="$([MSBuild]::IsOSPlatform('Linux'))">unix</_TPRid>
       <_TPRid Condition="$([MSBuild]::IsOSPlatform('OSX'))">unix</_TPRid>
       <_TPRid Condition="$([MSBuild]::IsOSPlatform('Windows'))">win</_TPRid>
+      <_TPNativeRid Condition="$([MSBuild]::IsOSPlatform('Windows'))">win-x64</_TPNativeRid>
+      <_TPNativeRid Condition="'$(RuntimeIdentifier)' != ''">$(RuntimeIdentifier)</_TPNativeRid>
       <_TPOutputDir>$(TargetDir)</_TPOutputDir>
       <_TPRuntimeDir>$(_TPOutputDir)runtimes/$(_TPRid)/lib/$(TargetFramework)</_TPRuntimeDir>
       <!-- For netstandard2.0, NuGet does not copy RID-specific assemblies.
            Fall back to the net9.0 sibling output (built first). -->
       <_TPRuntimeDir Condition="!Exists('$(_TPRuntimeDir)')">$(_TPOutputDir)../net9.0/runtimes/$(_TPRid)/lib/net9.0</_TPRuntimeDir>
+      <_TPNativeDir>$(_TPOutputDir)runtimes/$(_TPNativeRid)/native</_TPNativeDir>
     </PropertyGroup>
     <ItemGroup>
       <_RidSpecificAssemblies Include="$(_TPRuntimeDir)/*.dll" />
+      <_NativeAssemblies Include="$(_TPNativeDir)/*.dll" Condition="'$(_TPNativeRid)' != ''" />
     </ItemGroup>
     <Message Importance="high" Text="TP RID copy: $(_TPRuntimeDir) -> $(_TPOutputDir)" />
     <Copy SourceFiles="@(_RidSpecificAssemblies)"
           DestinationFolder="$(_TPOutputDir)"
           OverwriteReadOnlyFiles="true"
           SkipUnchangedFiles="false"
           Condition="Exists('$(_TPRuntimeDir)')" />
+    <Message Importance="high" Text="TP native copy: $(_TPNativeDir) -> $(_TPOutputDir)" Condition="'$(_TPNativeRid)' != ''" />
+    <Copy SourceFiles="@(_NativeAssemblies)"
+          DestinationFolder="$(_TPOutputDir)"
+          OverwriteReadOnlyFiles="true"
+          SkipUnchangedFiles="false"
+          Condition="'$(_TPNativeRid)' != '' and Exists('$(_TPNativeDir)')" />
   </Target>
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>