move to Microsoft.Data.SqlClient

dsyme · dsyme · commit ffb6fc54eadd · 2026-03-07T22:39:59.000Z
diff --git a/build/build.fs b/build/build.fs
@@ -127,7 +127,7 @@ Target.create "Build" (fun _ ->
             |> dnDefault)
         slnPath)
 
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.IO.Compression
 open Fake.DotNet.Testing
 
diff --git a/build/paket.references b/build/paket.references
@@ -15,5 +15,5 @@ Fake.Tools.Git
 FSharp.Core
 FSharp.Formatting
 NuGet.CommandLine
-System.Data.SqlClient
+Microsoft.Data.SqlClient
 System.Configuration.ConfigurationManager
diff --git a/paket.dependencies b/paket.dependencies
@@ -24,7 +24,7 @@ group Build
 	nuget FSharp.Compiler.Service 43.8.301
 
 	nuget NuGet.CommandLine
-	nuget System.Data.SqlClient
+	nuget Microsoft.Data.SqlClient
 	
 	nuget System.Configuration.ConfigurationManager
 
@@ -44,7 +44,7 @@ group DesignTime
 
     nuget System.Configuration.ConfigurationManager 9.0.4
 	nuget System.Data.Common
-	nuget System.Data.SqlClient
+	nuget Microsoft.Data.SqlClient
 	nuget System.Runtime.Caching
     nuget FSharp.Core 8.0.301
 	nuget Microsoft.SqlServer.TransactSql.ScriptDom
@@ -54,7 +54,7 @@ group Test
 	source https://www.nuget.org/api/v2/
 
 	nuget FSharp.Core redirects:force
-	nuget System.Data.SqlClient
+	nuget Microsoft.Data.SqlClient
 	nuget System.Configuration.ConfigurationManager
 	
 	nuget Microsoft.SqlServer.Types ~> 12
@@ -69,7 +69,7 @@ group TestProjects
 
 	nuget FSharp.Core = 8.0.301
 
-	nuget System.Data.SqlClient
+	nuget Microsoft.Data.SqlClient
 	nuget System.Configuration.ConfigurationManager
 
 group Samples
@@ -78,6 +78,6 @@ group Samples
 	storage: none
 
 	nuget FSharp.Core = 8.0.301
-	nuget System.Data.SqlClient
+	nuget Microsoft.Data.SqlClient
 	nuget System.Configuration.ConfigurationManager
 	nuget FSharp.Data.SqlClient
diff --git a/paket.lock b/paket.lock
diff --git a/src/SqlClient.DesignTime/AssemblyInfo.fs b/src/SqlClient.DesignTime/AssemblyInfo.fs
@@ -1,6 +1,5 @@
 ﻿// Auto-Generated by FAKE; do not edit
 namespace System
-
 open System.Reflection
 open System.Runtime.CompilerServices
 
@@ -13,20 +12,9 @@ open System.Runtime.CompilerServices
 do ()
 
 module internal AssemblyVersionInformation =
-    [<Literal>]
-    let AssemblyTitle = "SqlClient.DesignTime"
-
-    [<Literal>]
-    let AssemblyProduct = "FSharp.Data.SqlClient.DesignTime"
-
-    [<Literal>]
-    let AssemblyDescription = "SqlClient F# type providers"
-
-    [<Literal>]
-    let AssemblyVersion = "3.0.0"
-
-    [<Literal>]
-    let AssemblyFileVersion = "3.0.0"
-
-    [<Literal>]
-    let InternalsVisibleTo = "SqlClient.Tests"
+    let [<Literal>] AssemblyTitle = "SqlClient.DesignTime"
+    let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient.DesignTime"
+    let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
+    let [<Literal>] AssemblyVersion = "3.0.0"
+    let [<Literal>] AssemblyFileVersion = "3.0.0"
+    let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"
diff --git a/src/SqlClient.DesignTime/DesignTime.fs b/src/SqlClient.DesignTime/DesignTime.fs
@@ -3,8 +3,8 @@
 open System
 open System.Reflection
 open System.Data
-open System.Data.SqlClient
-open Microsoft.SqlServer.Server
+open Microsoft.Data.SqlClient
+open Microsoft.Data.SqlClient.Server
 open System.Collections.Generic
 open System.Diagnostics
 open Microsoft.FSharp.Quotations
@@ -764,7 +764,7 @@ type DesignTime private () =
                         //done via reflection because not implemented on Mono
                         let sqlDataRecordType =
                             typeof<SqlCommand>.Assembly
-                                .GetType("Microsoft.SqlServer.Server.SqlDataRecord", throwOnError = true)
+                                .GetType("Microsoft.Data.SqlClient.Server.SqlDataRecord", throwOnError = true)
 
                         let record =
                             Activator.CreateInstance(
diff --git a/src/SqlClient.DesignTime/DesignTimeConnectionString.fs b/src/SqlClient.DesignTime/DesignTimeConnectionString.fs
@@ -68,7 +68,7 @@ type internal DesignTimeConnectionString =
         | _, Lazy x ->
             let providerName =
                 if String.IsNullOrEmpty x.ProviderName then
-                    "System.Data.SqlClient"
+                    "Microsoft.Data.SqlClient"
                 else
                     x.ProviderName
 
diff --git a/src/SqlClient.DesignTime/QuotationsFactory.fs b/src/SqlClient.DesignTime/QuotationsFactory.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Reflection
 open System.Collections
 open System.Diagnostics
diff --git a/src/SqlClient.DesignTime/SqlClientExtensions.fs b/src/SqlClient.DesignTime/SqlClientExtensions.fs
@@ -6,7 +6,7 @@ open System.Data
 open System.Collections.Generic
 open System.IO
 open System.Threading.Tasks
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open FSharp.Data.SqlClient.Internals
 open System.Diagnostics
 
diff --git a/src/SqlClient.DesignTime/SqlClientProvider.fs b/src/SqlClient.DesignTime/SqlClientProvider.fs
@@ -3,7 +3,7 @@
 open System
 open System.Collections.Generic
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Diagnostics
 open System.IO
 open System.Reflection
diff --git a/src/SqlClient.DesignTime/SqlCommandProvider.fs b/src/SqlClient.DesignTime/SqlCommandProvider.fs
@@ -3,7 +3,7 @@
 open System
 open System.Diagnostics
 open System.IO
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Reflection
 open System.Runtime.CompilerServices
 open Microsoft.FSharp.Core.CompilerServices
diff --git a/src/SqlClient.DesignTime/SqlEnumProvider.fs b/src/SqlClient.DesignTime/SqlEnumProvider.fs
@@ -72,7 +72,7 @@ type SqlEnumProvider(config: TypeProviderConfig) as this =
             parameters =
                 [ ProvidedStaticParameter("Query", typeof<string>)
                   ProvidedStaticParameter("ConnectionStringOrName", typeof<string>)
-                  ProvidedStaticParameter("Provider", typeof<string>, "System.Data.SqlClient")
+                  ProvidedStaticParameter("Provider", typeof<string>, "Microsoft.Data.SqlClient")
                   ProvidedStaticParameter("ConfigFile", typeof<string>, "")
                   ProvidedStaticParameter("Kind", typeof<SqlEnumKind>, SqlEnumKind.Default) ],
             instantiationFunction =
@@ -96,7 +96,7 @@ type SqlEnumProvider(config: TypeProviderConfig) as this =
 <summary>Enumeration based on SQL query.</summary> 
 <param name='Query'>SQL used to get the enumeration labels and values. A result set must have at least two columns. The first one is a label.</param>
 <param name='ConnectionString'>String used to open a data connection.</param>
-<param name='Provider'>Invariant name of a ADO.NET provider. Default is "System.Data.SqlClient".</param>
+<param name='Provider'>Invariant name of a ADO.NET provider. Default is "Microsoft.Data.SqlClient".</param>
 <param name='ConfigFile'>The name of the configuration file that’s used for connection strings at DESIGN-TIME. The default value is app.config or web.config.</param>
 <param name='Kind'></param>
 """
diff --git a/src/SqlClient.DesignTime/paket.references b/src/SqlClient.DesignTime/paket.references
@@ -2,7 +2,7 @@ group DesignTime
 
 System.Configuration.ConfigurationManager
 System.Data.Common
-System.Data.SqlClient
+Microsoft.Data.SqlClient
 System.Runtime.Caching
 Microsoft.SqlServer.TransactSql.ScriptDom
 Microsoft.SqlServer.Types
diff --git a/src/SqlClient.Samples/ConsoleSample/paket.references b/src/SqlClient.Samples/ConsoleSample/paket.references
@@ -1,5 +1,5 @@
 group Samples
 FSharp.Core
 FSharp.Data.SqlClient
-System.Data.SqlClient
+Microsoft.Data.SqlClient
 System.Configuration.ConfigurationManager
diff --git a/src/SqlClient.TestProjects/Lib/paket.references b/src/SqlClient.TestProjects/Lib/paket.references
@@ -1,4 +1,4 @@
 group TestProjects
     FSharp.Core
-    System.Data.SqlClient
+    Microsoft.Data.SqlClient
     System.Configuration.ConfigurationManager
diff --git a/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/paket.references b/src/SqlClient.TestProjects/SqlClient.Tests.NetCoreApp/paket.references
@@ -1,4 +1,4 @@
 group TestProjects
     FSharp.Core
-    System.Data.SqlClient
+    Microsoft.Data.SqlClient
     System.Configuration.ConfigurationManager
diff --git a/src/SqlClient/AssemblyInfo.fs b/src/SqlClient/AssemblyInfo.fs
@@ -1,6 +1,5 @@
 ﻿// Auto-Generated by FAKE; do not edit
 namespace System
-
 open System.Reflection
 open System.Runtime.CompilerServices
 
@@ -13,20 +12,9 @@ open System.Runtime.CompilerServices
 do ()
 
 module internal AssemblyVersionInformation =
-    [<Literal>]
-    let AssemblyTitle = "SqlClient"
-
-    [<Literal>]
-    let AssemblyProduct = "FSharp.Data.SqlClient"
-
-    [<Literal>]
-    let AssemblyDescription = "SqlClient F# type providers"
-
-    [<Literal>]
-    let AssemblyVersion = "3.0.0"
-
-    [<Literal>]
-    let AssemblyFileVersion = "3.0.0"
-
-    [<Literal>]
-    let InternalsVisibleTo = "SqlClient.Tests"
+    let [<Literal>] AssemblyTitle = "SqlClient"
+    let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient"
+    let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
+    let [<Literal>] AssemblyVersion = "3.0.0"
+    let [<Literal>] AssemblyFileVersion = "3.0.0"
+    let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"
diff --git a/src/SqlClient/DataTable.fs b/src/SqlClient/DataTable.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Collections.Generic
 open FSharp.Data.SqlClient.Internals
 
diff --git a/src/SqlClient/Extensions.fs b/src/SqlClient/Extensions.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 
 [<AutoOpen>]
 module Extensions =
diff --git a/src/SqlClient/ISqlCommand.fs b/src/SqlClient/ISqlCommand.fs
@@ -1,6 +1,6 @@
 ﻿namespace FSharp.Data.SqlClient
 
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 
 [<CompilerMessageAttribute("This API supports the FSharp.Data.SqlClient infrastructure and is not intended to be used directly from your code.",
                            101,
@@ -21,7 +21,7 @@ namespace FSharp.Data.SqlClient.Internals
 
 open System
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Reflection
 open FSharp.Data.SqlClient
 open FSharp.Data.SqlClient.Internals
@@ -260,13 +260,13 @@ type ``ISqlCommand Implementation``(cfg: DesignTimeConfig, connection: Connectio
                     | SqlDbType.Structured ->
                         // TODO: Maybe make this lazy?
 
-                        //p.Value <- value |> unbox |> Seq.cast<Microsoft.SqlServer.Server.SqlDataRecord>
+                        //p.Value <- value |> unbox |> Seq.cast<Microsoft.Data.SqlClient.Server.SqlDataRecord>
 
                         //done via reflection because not implemented on Mono
 
                         let sqlDataRecordType =
                             typeof<SqlCommand>.Assembly
-                                .GetType("Microsoft.SqlServer.Server.SqlDataRecord", throwOnError = true)
+                                .GetType("Microsoft.Data.SqlClient.Server.SqlDataRecord", throwOnError = true)
 
                         let records =
                             typeof<Linq.Enumerable>
diff --git a/src/SqlClient/Shared.fs b/src/SqlClient/Shared.fs
@@ -23,7 +23,7 @@ open System
 open System.Text
 open System.Data
 open System.Collections.Generic
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Runtime.Serialization
 open System.Runtime.Serialization.Json
 open System.IO
diff --git a/src/SqlClient/SqlClient.fsproj b/src/SqlClient/SqlClient.fsproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="FSharp.Core" Version="8.0.301" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
diff --git a/tests/SqlClient.DesignTime.Tests/paket.references b/tests/SqlClient.DesignTime.Tests/paket.references
@@ -1,6 +1,6 @@
 ﻿group Test
 	FSharp.Core
-	System.Data.SqlClient
+	Microsoft.Data.SqlClient
 	System.Configuration.ConfigurationManager
 	xunit
 	xunit.runner.visualstudio
diff --git a/tests/SqlClient.SqlServerTypes.Tests/paket.references b/tests/SqlClient.SqlServerTypes.Tests/paket.references
@@ -1,6 +1,6 @@
 ﻿group Test
 	FSharp.Core
-	System.Data.SqlClient
+	Microsoft.Data.SqlClient
 	System.Configuration.ConfigurationManager
     Microsoft.SqlServer.Types redirects: force
 	Newtonsoft.Json
diff --git a/tests/SqlClient.Tests/CreateCommand.fs b/tests/SqlClient.Tests/CreateCommand.fs
@@ -219,7 +219,7 @@ let resultSetMapping () =
             ResultType.DataReader
          >()
 
-    let readToMap (reader: System.Data.SqlClient.SqlDataReader) =
+    let readToMap (reader: Microsoft.Data.SqlClient.SqlDataReader) =
         seq {
             try
                 while (reader.Read()) do
@@ -253,7 +253,7 @@ let ``Runtime column names`` () =
     use cmd = DB.CreateCommand<"exec dbo.[Get]", ResultType.DataReader>()
     Assert.False(cmd.Execute().NextResult())
 
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 
 type SqlDataReader with
     member this.ToRecords<'T>() =
@@ -275,7 +275,7 @@ let CreareDynamicRecords () =
     use cmd = DB.CreateCommand<getDatesQuery, TypeName="GetDatesQuery">()
     use conn = new SqlConnection(ConnectionStrings.AdventureWorksLiteral)
     conn.Open()
-    let cmd = new System.Data.SqlClient.SqlCommand(getDatesQuery, conn)
+    let cmd = new Microsoft.Data.SqlClient.SqlCommand(getDatesQuery, conn)
 
     cmd.ExecuteReader().ToRecords<DB.Commands.GetDatesQuery.Record>()
     |> Seq.toArray
diff --git a/tests/SqlClient.Tests/DataTablesTests.fs b/tests/SqlClient.Tests/DataTablesTests.fs
@@ -3,7 +3,7 @@
 open System
 open System.Configuration
 open System.Transactions
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open System.Data
 open FSharp.Data
 open FSharp.Data.SqlClient
diff --git a/tests/SqlClient.Tests/ProgrammabilityTests.fs b/tests/SqlClient.Tests/ProgrammabilityTests.fs
@@ -5,7 +5,7 @@ open FSharp.Data.SqlClient
 open FSharp.Data.SqlClient.Tests
 
 open System
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open Xunit
 
 type AdventureWorks = SqlProgrammabilityProvider<ConnectionStrings.AdventureWorksNamed>
diff --git a/tests/SqlClient.Tests/ResultTypeTests.fs b/tests/SqlClient.Tests/ResultTypeTests.fs
@@ -17,7 +17,7 @@ let command =
 type ResultTypeReader =
     SqlCommandProvider<command, ConnectionStrings.AdventureWorksNamed, ResultType=ResultType.DataReader>
 
-let ReadToMaps (reader: System.Data.SqlClient.SqlDataReader) =
+let ReadToMaps (reader: Microsoft.Data.SqlClient.SqlDataReader) =
     seq {
         try
             while (reader.Read()) do
diff --git a/tests/SqlClient.Tests/SynonymsTests.fs b/tests/SqlClient.Tests/SynonymsTests.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.Data
-open System.Data.SqlClient
+open Microsoft.Data.SqlClient
 open FSharp.Data
 open FSharp.Data.SqlClient
 open FSharp.Data.SqlClient.Tests
diff --git a/tests/SqlClient.Tests/TVPTests.fs b/tests/SqlClient.Tests/TVPTests.fs
diff --git a/tests/SqlClient.Tests/TempTableTests.fs b/tests/SqlClient.Tests/TempTableTests.fs
diff --git a/tests/SqlClient.Tests/TransactionTests.fs b/tests/SqlClient.Tests/TransactionTests.fs
diff --git a/tests/SqlClient.Tests/TypeProviderTest.fs b/tests/SqlClient.Tests/TypeProviderTest.fs
diff --git a/tests/SqlClient.Tests/app.config b/tests/SqlClient.Tests/app.config
diff --git a/tests/SqlClient.Tests/paket.references b/tests/SqlClient.Tests/paket.references
