remove legacy namespace compatibility, adjust release notes

smoothdeveloper · smoothdeveloper · commit 0d91a9788f3d · 2026-05-07T08:54:28.000+02:00
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,8 @@
+#### 2.9.99-alpha April 30, 2024
+
+* Issue #482 Support for Microsoft.Data.SqlClient in FSharp.Data.MicrosoftSqlClient package
+* Contributor: Daniel Little (https://github.com/daniellittledev), Gauthier Segay (https://github.com/smoothdeveloper)
+
 #### 2.1.3 April 30, 2024
 
 * Issue #440 Toolchain and SDK adjustments, deprecated runtime support for net40
diff --git a/src/SqlClient.DesignTime/AssemblyInfo.fs b/src/SqlClient.DesignTime/AssemblyInfo.fs
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient.DesignTime")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("2.9.99")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.99")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SqlClient.DesignTime"
     let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient.DesignTime"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.1.3"
-    let [<Literal>] AssemblyFileVersion = "2.1.3"
+    let [<Literal>] AssemblyVersion = "2.9.99"
+    let [<Literal>] AssemblyFileVersion = "2.9.99"
     let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"
diff --git a/src/SqlClient.DesignTime/MicrosoftAssemblyInfo.fs b/src/SqlClient.DesignTime/MicrosoftAssemblyInfo.fs
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("MicrosoftSqlClient.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.MicrosoftSqlClient.DesignTime")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("2.9.99")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.99")>]
 [<assembly: InternalsVisibleToAttribute("MicrosoftSqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "MicrosoftSqlClient.DesignTime"
     let [<Literal>] AssemblyProduct = "FSharp.Data.MicrosoftSqlClient.DesignTime"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.1.3"
-    let [<Literal>] AssemblyFileVersion = "2.1.3"
+    let [<Literal>] AssemblyVersion = "2.9.99"
+    let [<Literal>] AssemblyFileVersion = "2.9.99"
     let [<Literal>] InternalsVisibleTo = "MicrosoftSqlClient.Tests"
diff --git a/src/SqlClient.DesignTime/MicrosoftSqlClient.DesignTime.fsproj b/src/SqlClient.DesignTime/MicrosoftSqlClient.DesignTime.fsproj
@@ -21,7 +21,8 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
     <DefineConstants>$(DefineConstants);MICROSOFT_DATA_SQLCLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;IS_DESIGNTIME;WITH_LEGACY_NAMESPACE</DefineConstants>
+    <DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;IS_DESIGNTIME</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <!--
diff --git a/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj b/src/SqlClient.DesignTime/SqlClient.DesignTime.fsproj
@@ -21,7 +21,8 @@
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
     <DefineConstants>$(DefineConstants);SYSTEM_DATA_SQLCLIENT</DefineConstants>
-    <DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;IS_DESIGNTIME;WITH_LEGACY_NAMESPACE</DefineConstants>
+    <DefineConstants>$(DefineConstants);DESIGNTIME_CODE_ONLY;IS_DESIGNTIME</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
     <!--
diff --git a/src/SqlClient/AssemblyInfo.fs b/src/SqlClient/AssemblyInfo.fs
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("SqlClient")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.SqlClient")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("2.9.99")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.99")>]
 [<assembly: InternalsVisibleToAttribute("SqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "SqlClient"
     let [<Literal>] AssemblyProduct = "FSharp.Data.SqlClient"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.1.3"
-    let [<Literal>] AssemblyFileVersion = "2.1.3"
+    let [<Literal>] AssemblyVersion = "2.9.99"
+    let [<Literal>] AssemblyFileVersion = "2.9.99"
     let [<Literal>] InternalsVisibleTo = "SqlClient.Tests"
diff --git a/src/SqlClient/MicrosoftAssemblyInfo.fs b/src/SqlClient/MicrosoftAssemblyInfo.fs
@@ -6,15 +6,15 @@ open System.Runtime.CompilerServices
 [<assembly: AssemblyTitleAttribute("MicrosoftSqlClient")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data.MicrosoftSqlClient")>]
 [<assembly: AssemblyDescriptionAttribute("SqlClient F# type providers")>]
-[<assembly: AssemblyVersionAttribute("2.1.3")>]
-[<assembly: AssemblyFileVersionAttribute("2.1.3")>]
+[<assembly: AssemblyVersionAttribute("2.9.99")>]
+[<assembly: AssemblyFileVersionAttribute("2.9.99")>]
 [<assembly: InternalsVisibleToAttribute("MicrosoftSqlClient.Tests")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "MicrosoftSqlClient"
     let [<Literal>] AssemblyProduct = "FSharp.Data.MicrosoftSqlClient"
     let [<Literal>] AssemblyDescription = "SqlClient F# type providers"
-    let [<Literal>] AssemblyVersion = "2.1.3"
-    let [<Literal>] AssemblyFileVersion = "2.1.3"
+    let [<Literal>] AssemblyVersion = "2.9.99"
+    let [<Literal>] AssemblyFileVersion = "2.9.99"
     let [<Literal>] InternalsVisibleTo = "MicrosoftSqlClient.Tests"
diff --git a/src/SqlClient/MicrosoftSqlClient.fsproj b/src/SqlClient/MicrosoftSqlClient.fsproj
@@ -9,9 +9,8 @@
     <NoWarn>101;44</NoWarn>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
-    <WithLegacyNamespaces>true</WithLegacyNamespaces>
     <DefineConstants>$(DefineConstants);MICROSOFT_DATA_SQLCLIENT</DefineConstants>
-    <DefineConstants Condition="'$(WithLegacyNamespaces)'=='true'">$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/src/SqlClient/Shared.fs b/src/SqlClient/Shared.fs
@@ -269,26 +269,3 @@ module RuntimeInternals =
 [<AutoOpen>]
 module Shared =    
     let DbNull = box DBNull.Value
-
-
-#if WITH_LEGACY_NAMESPACE
-namespace FSharp.Data
-open System
-[<Obsolete("use open 'FSharp.Data.SqlClient' namespace instead")>]
-type ResultType  = FSharp.Data.SqlClient.ResultType
-[<Obsolete("use open 'FSharp.Data.SqlClient' namespace instead")>]
-type SqlEnumKind = FSharp.Data.SqlClient.SqlEnumKind
-[<Obsolete("use open 'FSharp.Data.SqlClient.Internals' namespace instead");AutoOpen>]
-module Obsolete = 
-
-  //module Encoding         = FSharp.Data.SqlClient.Internals.Encoding
-  //module RuntimeInternals = FSharp.Data.SqlClient.Internals.RuntimeInternals
-  //module Shared           = FSharp.Data.SqlClient.Internals.Shared
-
-  type ResultRank         = FSharp.Data.SqlClient.Internals.ResultRank
-  type Mapper             = FSharp.Data.SqlClient.Internals.Mapper
-  type Column             = FSharp.Data.SqlClient.Internals.Column
-  type TypeInfo           = FSharp.Data.SqlClient.Internals.TypeInfo
-  type Parameter          = FSharp.Data.SqlClient.Internals.Parameter
-  type TempTableLoader    = FSharp.Data.SqlClient.Internals.TempTableLoader
-#endif
diff --git a/src/SqlClient/SqlClient.fsproj b/src/SqlClient/SqlClient.fsproj
@@ -9,9 +9,8 @@
     <NoWarn>101</NoWarn>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
-    <WithLegacyNamespaces>true</WithLegacyNamespaces>
     <DefineConstants>$(DefineConstants);SYSTEM_DATA_SQLCLIENT</DefineConstants>
-    <DefineConstants Condition="'$(WithLegacyNamespaces)'=='true'">$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
diff --git a/tests/SqlClient.Tests/MicrosoftSqlClient.Tests.fsproj b/tests/SqlClient.Tests/MicrosoftSqlClient.Tests.fsproj
@@ -7,7 +7,6 @@
     <AssemblyName>MicrosoftSqlClient.Tests</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <DefineConstants>$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
     <DefineConstants>$(DefineConstants);MICROSOFT_DATA_SQLCLIENT</DefineConstants>
     <NoWarn>$(NoWarn);101</NoWarn>
     <!-- 
diff --git a/tests/SqlClient.Tests/SqlClient.Tests.fsproj b/tests/SqlClient.Tests/SqlClient.Tests.fsproj
@@ -7,7 +7,6 @@
     <AssemblyName>SqlClient.Tests</AssemblyName>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <DefineConstants>$(DefineConstants);WITH_LEGACY_NAMESPACE</DefineConstants>
     <NoWarn>$(NoWarn);101</NoWarn>
     <!-- 
     disable error FS0044: This construct is deprecated. use 'FSharp.Data.SqlClient.Internals.ISqlCommand' instead 
diff --git a/tests/SqlClient.Tests/TypeProviderTest.fs b/tests/SqlClient.Tests/TypeProviderTest.fs
@@ -3,6 +3,7 @@ module FSharp.Data.SqlClient.Tests.TypeProviderTest
 open FSharp.Data
 open FSharp.Data.SqlClient
 open FSharp.Data.SqlClient.Tests
+open FSharp.Data.SqlClient.Internals
 open System
 open System.Data
 #if SYSTEM_DATA_SQLCLIENT
@@ -348,17 +349,17 @@ let ResultsetRuntimeVerificationLessThanExpectedColumns() =
         SELECT * FROM XS
     "
 
-    Assert.False(SqlClient.Configuration.Current.ResultsetRuntimeVerification)
+    Assert.False(FsharpDataSqlClientConfiguration.Current.ResultsetRuntimeVerification)
 
     try
-        SqlClient.Configuration.Current <- { ResultsetRuntimeVerification = true }
+        FsharpDataSqlClientConfiguration.Current <- { ResultsetRuntimeVerification = true }
         let err = Assert.Throws<InvalidOperationException>(fun() -> cmd.Execute() |> Seq.toArray |> ignore)    
         Assert.Equal<string>(
             "Expected at least 3 columns in result set but received only 2.",
             err.Message
         )
     finally 
-        SqlClient.Configuration.Current <- { ResultsetRuntimeVerification = false}
+        FsharpDataSqlClientConfiguration.Current <- { ResultsetRuntimeVerification = false}
 
     let err = Assert.Throws<IndexOutOfRangeException>(fun() -> cmd.Execute() |> Seq.toArray |> ignore)    
     Assert.Equal<string>(
@@ -393,18 +394,18 @@ let ResultsetRuntimeVerificationDiffColumnTypes() =
         SELECT * FROM XS
     "
 
-    Assert.False(Configuration.Current.ResultsetRuntimeVerification)
+    Assert.False(FsharpDataSqlClientConfiguration.Current.ResultsetRuntimeVerification)
 
     try
-        Configuration.Current <- { ResultsetRuntimeVerification = true }
+        FsharpDataSqlClientConfiguration.Current <- { ResultsetRuntimeVerification = true }
 
         let err = Assert.Throws<InvalidOperationException>(fun() -> cmd.Execute() |> Seq.toArray |> ignore)    
         Assert.Equal<string>(
             """Expected column [Total] of type "System.Int32" at position 1 (0-based indexing) but received column [Now] of type "System.DateTime".""",
             err.Message
         )
     finally 
-        Configuration.Current <- { ResultsetRuntimeVerification = false}
+        FsharpDataSqlClientConfiguration.Current <- { ResultsetRuntimeVerification = false}
 
     let err = Assert.Throws<InvalidCastException>(fun() -> cmd.Execute() |> Seq.toArray |> ignore)    
     
