From 871859c12551583faf69596bc8051e91b88f853b Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Thu, 4 Dec 2025 17:24:43 -0600
Subject: [PATCH 01/12] Add reference to MSS for netcore to fix
 InvalidUdtException reference issue

---
 .../src/Microsoft.Data.SqlClient.csproj       | 21 ++++++++++------
 .../src/Microsoft/Data/Common/AdapterUtil.cs  | 25 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 69ddbf01fd..6e22e0fd51 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <!-- References ====================================================== -->
+  <!-- References that apply to all target frameworks -->
   <ItemGroup>
-    <!-- References that apply to all target frameworks -->
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
@@ -38,18 +38,25 @@
     <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs"  />
   </ItemGroup>
+
+  <!-- References that only apply to net462 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <!-- References that only apply to net462 -->
     <Reference Include="System.Configuration" />
     <Reference Include="System.Transactions" />
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="System.Threading.Channels" />
 	</ItemGroup>
 
-  <!-- System.Buffers, System.Memory, and System.Runtime.InteropServices.RuntimeInformation are included in .NET 10+ BCL -->
-  <ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
-    <PackageReference Include="System.Buffers" />
-    <PackageReference Include="System.Memory" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+  <!-- References that only apply to netcore -->
+  <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="Microsoft.SqlServer.Server" />
+
+    <!-- References that only apply to netcore < 10 -->
+    <PackageReference Include="System.Buffers"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
+    <PackageReference Include="System.Memory"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"
+                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index dcd9f4bac9..a7d62148df 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -69,24 +69,27 @@ internal static partial class ADP
         internal const int MaxBufferAccessTokenExpiry = 600;
 
         #region UDT
-#if NETFRAMEWORK
-        private static readonly MethodInfo s_method = typeof(InvalidUdtException).GetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static);
-#endif
+
+        #if NETFRAMEWORK
+        private static readonly MethodInfo s_udtConstructor =
+            typeof(InvalidUdtException).GetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static);
+        #endif
+
         /// <summary>
         /// Calls "InvalidUdtException.Create" method when an invalid UDT occurs.
         /// </summary>
         internal static InvalidUdtException CreateInvalidUdtException(Type udtType, string resourceReasonName)
         {
-            // @TODO: Can we adopt the netcore version?
-            InvalidUdtException e =
-#if NETFRAMEWORK
-                (InvalidUdtException)s_method.Invoke(null, new object[] { udtType, resourceReasonName });
-            ADP.TraceExceptionAsReturnValue(e);
-#else
-                InvalidUdtException.Create(udtType, resourceReasonName);
-#endif
+            #if NETFRAMEWORK
+            InvalidUdtException e = (InvalidUdtException)s_udtConstructor.Invoke(null, [udtType, resourceReasonName]);
+            #else
+            InvalidUdtException e = InvalidUdtException.Create(udtType, resourceReasonName);
+            #endif
+
+            TraceExceptionAsReturnValue(e);
             return e;
         }
+
         #endregion
 
         static private void TraceException(string trace, Exception e)

From 8250468c2ed54228f20a5119a33232787cb5f0e2 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Thu, 4 Dec 2025 17:36:42 -0600
Subject: [PATCH 02/12] SqlDependencyUtils.* are all netcore files, rename as
 such, and wrap in #if NET

---
 .../netcore/src/Microsoft.Data.SqlClient.csproj           | 8 ++++----
 ...pDomain.cs => SqlDependencyUtils.AppDomain.netcore.cs} | 4 ++++
 ... => SqlDependencyUtils.AssemblyLoadContext.netcore.cs} | 0
 3 files changed, 8 insertions(+), 4 deletions(-)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SqlDependencyUtils.AppDomain.cs => SqlDependencyUtils.AppDomain.netcore.cs} (97%)
 rename src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/{SqlDependencyUtils.AssemblyLoadContext.cs => SqlDependencyUtils.AssemblyLoadContext.netcore.cs} (100%)

diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
index 73c0cb3c9c..8235f71fb7 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -815,11 +815,11 @@
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.cs">
       <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs">
+      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.netcore.cs</Link>
     </Compile>
-    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs">
-      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.cs</Link>
+    <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs">
+      <Link>Microsoft\Data\SqlClient\SqlDependencyUtils.AssemblyLoadContext.netcore.cs</Link>
     </Compile>
     <Compile Include="$(CommonSourceRoot)Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs">
       <Link>Microsoft\Data\SqlClient\SqlEnclaveAttestationParameters.Crypto.cs</Link>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.netcore.cs
similarity index 97%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.netcore.cs
index d82a9fc8fa..9e030d7c42 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AppDomain.netcore.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+#if NET
+
 using System;
 
 namespace Microsoft.Data.SqlClient
@@ -18,3 +20,5 @@ partial void SubscribeToAppDomainUnload()
         }
     }
 }
+
+#endif
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AssemblyLoadContext.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AssemblyLoadContext.netcore.cs
similarity index 100%
rename from src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AssemblyLoadContext.cs
rename to src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlDependencyUtils.AssemblyLoadContext.netcore.cs

From d2537673797c4e508e74dc2163806c215f1c34ec Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Fri, 5 Dec 2025 15:54:05 -0600
Subject: [PATCH 03/12] Set build output path

---
 .../src/Microsoft.Data.SqlClient.csproj            | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 6e22e0fd51..a3a3c0aa2f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
+    <Configurations>Debug;Release;</Configurations>
+    <RootNamespace />
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-		<RootNamespace />
 	</PropertyGroup>
 
   <!-- OS Constants ==================================================== -->
@@ -20,6 +21,11 @@
     <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
   </PropertyGroup>
 
+  <!-- Build Output ==================================================== -->
+  <PropertyGroup>
+    <OutputPath>$(Artifacts)bin/$(Configuration)/$(AssemblyName)/$(TargetFramework)-$(TargetOs.ToLower())</OutputPath>
+  </PropertyGroup>
+
   <!-- Embedded resources ============================================== -->
   <ItemGroup>
     <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
@@ -35,13 +41,13 @@
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" />
     <PackageReference Include="System.Security.Cryptography.Pkcs"  />
   </ItemGroup>
 
   <!-- References that only apply to net462 -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Configuration" />
+    <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Transactions" />
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="System.Threading.Channels" />
@@ -50,6 +56,7 @@
   <!-- References that only apply to netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
     <PackageReference Include="Microsoft.SqlServer.Server" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
 
     <!-- References that only apply to netcore < 10 -->
     <PackageReference Include="System.Buffers"
@@ -59,4 +66,7 @@
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"
                       Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
   </ItemGroup>
+
+  <!-- CodeGen Targets ================================================= -->
+  <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
 </Project>

From 477219dfd019827c6836f46b88d5f2efbbee0a80 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Fri, 5 Dec 2025 17:21:16 -0600
Subject: [PATCH 04/12] Add OS-specific check for target frameworks Remove
 runtime identifier/target framework from output path

---
 .../src/Microsoft.Data.SqlClient.csproj         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index a3a3c0aa2f..8ea08e28fa 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-		<TargetFrameworks>net462;net8.0;net9.0</TargetFrameworks>
+	<!-- General Properties ============================================== -->
+  <PropertyGroup>
     <Configurations>Debug;Release;</Configurations>
     <RootNamespace />
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -17,12 +17,21 @@
 
     <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
     <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here. -->
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants),_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants),_WINDOWS</DefineConstants>
+    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants);_UNIX</DefineConstants>
+    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants);_WINDOWS</DefineConstants>
+  </PropertyGroup>
+
+  <!-- Target Frameworks =============================================== -->
+  <PropertyGroup>
+    <!-- net462 is only supported on Windows, so we will only add it if we're building for Windows -->
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
+    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <OutputPath>$(Artifacts)bin/$(Configuration)/$(AssemblyName)/$(TargetFramework)-$(TargetOs.ToLower())</OutputPath>
   </PropertyGroup>
 

From 70fa18faa9b9894fdbbbfc633b2e7b5e5fb9ebd4 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Fri, 5 Dec 2025 17:50:07 -0600
Subject: [PATCH 05/12] Builds! Whoohooo!

---
 .../src/Microsoft.Data.SqlClient.csproj       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 8ea08e28fa..9f94fbfede 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -8,6 +8,7 @@
 
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>
+    <!-- @TODO: Move to directory.build.props? -->
     <!-- If a target OS was not specified, use the current OS as the target OS. -->
     <TargetOs Condition="'$(TargetOs)' == ''">$(OS)</TargetOs>
 
@@ -16,7 +17,7 @@
     <!--<TargetOs>Windows_NT</TargetOs>-->
 
     <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
-    <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here. -->
+    <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here.  -->
     <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants);_UNIX</DefineConstants>
     <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants);_WINDOWS</DefineConstants>
   </PropertyGroup>
@@ -30,15 +31,23 @@
 
   <!-- Build Output ==================================================== -->
   <PropertyGroup>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <OutputPath>$(Artifacts)bin/$(Configuration)/$(AssemblyName)/$(TargetFramework)-$(TargetOs.ToLower())</OutputPath>
+    <!-- @TODO: Move to directory.build.props? -->
+    <ArtifactPath>$(RepoRoot)artifacts/</ArtifactPath>
+
+    <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
+    <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it      -->
+    <!-- would be nice to have a flat directory structure, it's more hassle than its worth.       -->
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(TargetOs.ToLower())/</OutputPath>
   </PropertyGroup>
 
   <!-- Embedded resources ============================================== -->
   <ItemGroup>
+    <!-- Linker directives to replace UseManagedNetworking with a constant if consumer specifies  -->
+    <!-- the app context switch in their csproj. This file only applies to netcore on windows.    -->
+    <!-- This file does not support pre-processor directives, so it must be conditionally         -->
+    <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
-                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'" />
+                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT' AND '$(TargetFramework)' == 'net462'" />
   </ItemGroup>
 
   <!-- References ====================================================== -->

From 61978e1e72641c6cba6d0242f20e4ac534ce8db9 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Fri, 5 Dec 2025 17:56:35 -0600
Subject: [PATCH 06/12] Common project build targets

---
 build2.proj | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 build2.proj

diff --git a/build2.proj b/build2.proj
new file mode 100644
index 0000000000..a3a1aec2a5
--- /dev/null
+++ b/build2.proj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<!-- Build Parameters ============================================== -->
+	<PropertyGroup>
+		<!-- Configuration:  Which build configuration to build                                 -->
+		<!-- Allowed values: Debug, Release                                                     -->
+		<!-- Default value:  Debug                                                              -->
+		<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
+
+		<!-- DotnetPath: Path to folder containing the `dotnet` binary. Override this if a      -->
+		<!--    specific version (eg, x86) is required. Otherwise, this defaults to using the   -->
+		<!--    dotnet binary in the PATH variable. The provided path should end with a `\` (or -->
+		<!--    `/`) character. Eg. C:\x86\                                                     -->
+		<DotnetPath Condition="'$(DotnetPath)' == ''"></DotnetPath>
+	</PropertyGroup>
+
+	<!-- Imports ======================================================= -->
+	<Import Project="src/Directory.Build.props" />
+
+	<!-- Microsoft.Data.SqlClient Build Targets ======================== -->
+	<PropertyGroup>
+		<MdsProjectPath>$(RepoRoot)src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj</MdsProjectPath>
+	</PropertyGroup>
+
+	<!-- BuildMds: Builds all binaries for MDS -->
+	<Target Name="BuildMds" DependsOnTargets="BuildMdsUnix;BuildMdsWindows" />
+
+	<!-- BuildMdsUnix: Builds all unix-specific MDS binaries -->
+	<Target Name="BuildMdsUnix">
+		<PropertyGroup>
+			<DotnetCommand>
+				$(DotnetPath)dotnet build $(MdsProjectPath)
+				  -p:Configuration=$(Configuration)
+				  -p:TargetOs=Unix
+			</DotnetCommand>
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+		</PropertyGroup>
+		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+	</Target>
+
+	<!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
+	<Target Name="BuildMdsWindows">
+		<PropertyGroup>
+			<DotnetCommand>
+				$(DotnetPath)dotnet build $(MdsProjectPath)
+				  -p:Configuration=$(Configuration)
+				  -p:TargetOs=Unix
+			</DotnetCommand>
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+		</PropertyGroup>
+		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+	</Target>
+</Project>
\ No newline at end of file

From 946f41b09407c47953dec520aaae68c26327e0a6 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Tue, 9 Dec 2025 17:45:42 -0600
Subject: [PATCH 07/12] Add common project back to the solution build targets

---
 src/Microsoft.Data.SqlClient.sln | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.Data.SqlClient.sln b/src/Microsoft.Data.SqlClient.sln
index 6696a8a31d..8b4f420f19 100644
--- a/src/Microsoft.Data.SqlClient.sln
+++ b/src/Microsoft.Data.SqlClient.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31912.275
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -561,6 +561,12 @@ Global
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x64.ActiveCfg = Release|Any CPU
 		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x86.ActiveCfg = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|x64.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Debug|x86.Build.0 = Debug|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x64.Build.0 = Release|Any CPU
+		{9A8996A8-6484-4AA7-B50F-F861430EDE2F}.Release|x86.Build.0 = Release|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4461063D-2F2B-274C-7E6F-F235119D258E}.Debug|x64.ActiveCfg = Debug|x64

From 2e920201086a626a261d1c4e67aec07aaebf22cc Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Wed, 10 Dec 2025 11:42:14 -0600
Subject: [PATCH 08/12] Comments from PR

---
 build2.proj                                                   | 2 +-
 .../src/Microsoft.Data.SqlClient.csproj                       | 2 +-
 .../src/Microsoft/Data/Common/AdapterUtil.cs                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build2.proj b/build2.proj
index a3a1aec2a5..49ba90514d 100644
--- a/build2.proj
+++ b/build2.proj
@@ -44,7 +44,7 @@
 			<DotnetCommand>
 				$(DotnetPath)dotnet build $(MdsProjectPath)
 				  -p:Configuration=$(Configuration)
-				  -p:TargetOs=Unix
+				  -p:TargetOs=Windows
 			</DotnetCommand>
 			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
 		</PropertyGroup>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 9f94fbfede..338944ccff 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -47,7 +47,7 @@
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
-                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT' AND '$(TargetFramework)' == 'net462'" />
+                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT' AND '$(TargetFramework)' != 'net462'" />
   </ItemGroup>
 
   <!-- References ====================================================== -->
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
index a7d62148df..64f827e261 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs
@@ -71,7 +71,7 @@ internal static partial class ADP
         #region UDT
 
         #if NETFRAMEWORK
-        private static readonly MethodInfo s_udtConstructor =
+        private static readonly MethodInfo s_udtFactory =
             typeof(InvalidUdtException).GetMethod("Create", BindingFlags.NonPublic | BindingFlags.Static);
         #endif
 
@@ -81,7 +81,7 @@ internal static partial class ADP
         internal static InvalidUdtException CreateInvalidUdtException(Type udtType, string resourceReasonName)
         {
             #if NETFRAMEWORK
-            InvalidUdtException e = (InvalidUdtException)s_udtConstructor.Invoke(null, [udtType, resourceReasonName]);
+            InvalidUdtException e = (InvalidUdtException)s_udtFactory.Invoke(null, [udtType, resourceReasonName]);
             #else
             InvalidUdtException e = InvalidUdtException.Create(udtType, resourceReasonName);
             #endif

From 8d4ca14b29a96e35fa3b48837da2a7facda4703a Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Tue, 16 Dec 2025 13:16:38 -0600
Subject: [PATCH 09/12] Rework package references as per comments, add
 normalized target os variable.

---
 build2.proj                                   |  2 +-
 .../src/Microsoft.Data.SqlClient.csproj       | 55 ++++++++++---------
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/build2.proj b/build2.proj
index a3a1aec2a5..fc1ba2b6e9 100644
--- a/build2.proj
+++ b/build2.proj
@@ -44,7 +44,7 @@
 			<DotnetCommand>
 				$(DotnetPath)dotnet build $(MdsProjectPath)
 				  -p:Configuration=$(Configuration)
-				  -p:TargetOs=Unix
+				  -p:TargetOs=Windows_NT
 			</DotnetCommand>
 			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
 		</PropertyGroup>
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 9f94fbfede..22a930d2b9 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -16,17 +16,19 @@
     <!--<TargetOs>Unix</TargetOs>-->
     <!--<TargetOs>Windows_NT</TargetOs>-->
 
+    <NormalizedTargetOs>$(TargetOs.ToLower())</NormalizedTargetOs>
+    
     <!-- NOTE: These constants are prefixed with _ to keep them separate from .NET 5+ precompiler -->
     <!--     flags. Those only apply to OS-specific target frameworks, and would interfere here.  -->
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'UNIX'">$(DefineConstants);_UNIX</DefineConstants>
-    <DefineConstants Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(DefineConstants);_WINDOWS</DefineConstants>
+    <DefineConstants Condition="'$(NormalizedTargetOs)' == 'unix'">$(DefineConstants);_UNIX</DefineConstants>
+    <DefineConstants Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(DefineConstants);_WINDOWS</DefineConstants>
   </PropertyGroup>
 
   <!-- Target Frameworks =============================================== -->
   <PropertyGroup>
     <!-- net462 is only supported on Windows, so we will only add it if we're building for Windows -->
     <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT'">$(TargetFrameworks);net462</TargetFrameworks>
+    <TargetFrameworks Condition="'$(NormalizedTargetOs)' == 'windows_nt'">$(TargetFrameworks);net462</TargetFrameworks>
   </PropertyGroup>
 
   <!-- Build Output ==================================================== -->
@@ -37,7 +39,7 @@
     <!-- MSBuild will add the target framework to the end of this path by default. Telling it not -->
     <!-- to is possible but requires also specifying the IntermediateOutputPath. So while it      -->
     <!-- would be nice to have a flat directory structure, it's more hassle than its worth.       -->
-    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(TargetOs.ToLower())/</OutputPath>
+    <OutputPath>$(ArtifactPath)$(AssemblyName)/$(Configuration)/$(NormalizedTargetOs)/</OutputPath>
   </PropertyGroup>
 
   <!-- Embedded resources ============================================== -->
@@ -47,42 +49,45 @@
     <!-- This file does not support pre-processor directives, so it must be conditionally         -->
     <!-- included into the build.                                                                 -->
     <EmbeddedResource Include="Resources/ILLink.Substitutions.xml"
-                      Condition="'$(TargetOs.ToUpper())' == 'WINDOWS_NT' AND '$(TargetFramework)' == 'net462'" />
+                      Condition="'$(NormalizedTargetOs)' == 'windows_nt' AND '$(TargetFramework)' == 'net462'" />
   </ItemGroup>
 
   <!-- References ====================================================== -->
-  <!-- References that apply to all target frameworks -->
-  <ItemGroup>
+  <!-- References for netframework -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.EnterpriseServices" />
+    <Reference Include="System.Transactions" />
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI">
+      <PrivateAssets>All</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
-    <PackageReference Include="System.Security.Cryptography.Pkcs"  />
-  </ItemGroup>
-
-  <!-- References that only apply to net462 -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.EnterpriseServices" />
-    <Reference Include="System.Transactions" />
-    <PackageReference Include="System.ValueTuple" />
+    <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
+    <PackageReference Include="System.ValueTuple" />
 	</ItemGroup>
 
-  <!-- References that only apply to netcore -->
+  <!-- References for netcore -->
   <ItemGroup Condition="'$(TargetFramework)' != 'net462'">
+    <PackageReference Include="Azure.Core" />
+    <PackageReference Include="Azure.Identity" />
+    <PackageReference Include="Microsoft.Bcl.Cryptography" />
+    <PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="Microsoft.SqlServer.Server" />
     <PackageReference Include="System.Configuration.ConfigurationManager" />
-
-    <!-- References that only apply to netcore < 10 -->
-    <PackageReference Include="System.Buffers"
-                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
-    <PackageReference Include="System.Memory"
-                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation"
-                      Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))" />
+    <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
 
   <!-- CodeGen Targets ================================================= -->

From 2a0ff493bcaa0fd78d2d96b3d4032c327a9981a7 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Tue, 16 Dec 2025 15:19:39 -0600
Subject: [PATCH 10/12] Add message on exec

---
 build2.proj | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/build2.proj b/build2.proj
index d9f9c62970..3a0bf16c1a 100644
--- a/build2.proj
+++ b/build2.proj
@@ -33,9 +33,11 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Unix
 			</DotnetCommand>
+			<!-- convert &gt;1 space to 1 space -->
 			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
 		</PropertyGroup>
-		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+		<Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
+		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 	</Target>
 
 	<!-- BuildMdsWindows: Builds all windows-specific MDS binaries -->
@@ -46,8 +48,10 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Windows_NT
 			</DotnetCommand>
+			<!-- convert &gt;1 space to 1 space --> 
 			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
 		</PropertyGroup>
-		<Exec ConsoleToMsBuild="true" Command="$(DotNetCommand)" />
+		<Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)"/>
+		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
 	</Target>
 </Project>

From ca43c2017b1392b775b77490fc0f4d776314f611 Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Wed, 17 Dec 2025 13:45:45 -0600
Subject: [PATCH 11/12] Add strong name signing and triple check package
 references

---
 .../src/Microsoft.Data.SqlClient.csproj             | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index 0880a8cd49..c686d19f00 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -6,6 +6,16 @@
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 	</PropertyGroup>
 
+  <!-- Strong name signing ============================================= -->
+  <PropertyGroup Condition="'$(CDP_BUILD_TYPE)' == 'Official'">
+    <SignAssembly>true</SignAssembly>
+    <KeyFile>$(SigningKeyPath)</KeyFile>
+    <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(CDP_BUILD_TYPE)' != 'Official'">
+    <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>
     <!-- @TODO: Move to directory.build.props? -->
@@ -58,6 +68,7 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Transactions" />
+    
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Bcl.Cryptography" />
@@ -69,6 +80,8 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" />
+    <PackageReference Include="System.Memory" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
     <PackageReference Include="System.Text.Json" />

From 392702b6417cc8223d40985afb09e1cdf0c14e2a Mon Sep 17 00:00:00 2001
From: Ben Russell <russellben@microsoft.com>
Date: Wed, 17 Dec 2025 18:48:47 -0600
Subject: [PATCH 12/12] Unconditional assembly originator key file, clarify
 command

---
 build2.proj                                               | 8 ++++----
 .../src/Microsoft.Data.SqlClient.csproj                   | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build2.proj b/build2.proj
index 3a0bf16c1a..479d802f12 100644
--- a/build2.proj
+++ b/build2.proj
@@ -33,8 +33,8 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Unix
 			</DotnetCommand>
-			<!-- convert &gt;1 space to 1 space -->
-			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+			<!-- Convert more than one whitespace character into one space --> 
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
 		</PropertyGroup>
 		<Message Text=">>> Building MDS for Unix via command: $(DotnetCommand)"/>
 		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
@@ -48,8 +48,8 @@
 				  -p:Configuration=$(Configuration)
 				  -p:TargetOs=Windows_NT
 			</DotnetCommand>
-			<!-- convert &gt;1 space to 1 space --> 
-			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s{2,}", " "))</DotnetCommand>
+			<!-- Convert more than one whitespace character into one space --> 
+			<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
 		</PropertyGroup>
 		<Message Text=">>> Building MDS for Windows via command: $(DotnetCommand)"/>
 		<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index c686d19f00..9bfceb3dc0 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -7,14 +7,14 @@
 	</PropertyGroup>
 
   <!-- Strong name signing ============================================= -->
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(CDP_BUILD_TYPE)' == 'Official'">
     <SignAssembly>true</SignAssembly>
     <KeyFile>$(SigningKeyPath)</KeyFile>
-    <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(CDP_BUILD_TYPE)' != 'Official'">
-    <AssemblyOriginatorKeyFile>$(SigningKeyPath)</AssemblyOriginatorKeyFile>
   </PropertyGroup>
+
   
   <!-- OS Constants ==================================================== -->
   <PropertyGroup>