From 2829592387a8f3186da3d2e8d0877ccce058cae1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:51:32 +0000
Subject: [PATCH 1/2] Backport PR #4063: Add missing System.Data.Common package
 reference

Co-authored-by: mdaigle <4722049+mdaigle@users.noreply.github.com>
Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/1252dab5-81b0-4f0e-8e0a-3399d448fd96
---
 Directory.Packages.props                                         | 1 +
 .../netfx/ref/Microsoft.Data.SqlClient.csproj                    | 1 +
 src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj | 1 +
 tools/specs/Microsoft.Data.SqlClient.nuspec                      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d043543e78..b1a858bf72 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -94,6 +94,7 @@
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.16.0" />
     <PackageVersion Include="System.Buffers" Version="4.6.1" />
+    <PackageVersion Include="System.Data.Common" Version="4.3.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="10.0.3" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
index 6765e009db..208181ffb6 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -43,6 +43,7 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index d0713280e6..dc935e4487 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -117,6 +117,7 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Memory" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index cbea2140c7..7a8e06e572 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -44,6 +44,7 @@
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
         <dependency id="System.Buffers" version="4.6.1" />
+        <dependency id="System.Data.Common" version="4.3.0" />
         <dependency id="System.Diagnostics.DiagnosticSource" version="10.0.3" />
         <dependency id="System.Memory" version="4.6.3" />
         <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />

From 084eada3dd59ade23e5ce284c48709d033c515f2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 23 Mar 2026 18:56:29 +0000
Subject: [PATCH 2/2] Document why System.Data.Common NuGet package is
 explicitly required on .NET Framework

Co-authored-by: paulmedynski <31868385+paulmedynski@users.noreply.github.com>
Agent-Logs-Url: https://github.com/dotnet/SqlClient/sessions/a5fab7d4-0f66-4552-98b9-4635fa63c441
---
 .../netfx/ref/Microsoft.Data.SqlClient.csproj               | 6 ++++++
 .../src/Microsoft.Data.SqlClient.csproj                     | 6 ++++++
 tools/specs/Microsoft.Data.SqlClient.nuspec                 | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
index 208181ffb6..b463da202d 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -43,6 +43,12 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <!-- System.Data.Common ships as an inbox assembly on .NET Framework, but the
+         inbox version predates APIs such as IDbColumnSchemaGenerator.  Declaring
+         an explicit dependency on the NuGet package (which type-forwards to the
+         inbox assembly when the runtime already provides a newer version) ensures
+         that consumers also receive the updated assembly and avoid CS0012 errors
+         when referencing types like IDbColumnSchemaGenerator via our public API. -->
     <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
index dc935e4487..9520356e8f 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
@@ -117,6 +117,12 @@
     <PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
     <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
     <PackageReference Include="System.Buffers" />
+    <!-- System.Data.Common ships as an inbox assembly on .NET Framework, but the
+         inbox version predates APIs such as IDbColumnSchemaGenerator.  Declaring
+         an explicit dependency on the NuGet package (which type-forwards to the
+         inbox assembly when the runtime already provides a newer version) ensures
+         that consumers also receive the updated assembly and avoid CS0012 errors
+         when referencing types like IDbColumnSchemaGenerator via our public API. -->
     <PackageReference Include="System.Data.Common" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" />
     <PackageReference Include="System.Memory" />
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 7a8e06e572..117af2dcb2 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -44,6 +44,11 @@
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.16.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.16.0" />
         <dependency id="System.Buffers" version="4.6.1" />
+        <!-- System.Data.Common ships as an inbox assembly on .NET Framework, but
+             the inbox version predates APIs such as IDbColumnSchemaGenerator.
+             This explicit dependency ensures consumers receive the updated NuGet
+             package version and avoid CS0012 errors when using types like
+             IDbColumnSchemaGenerator exposed through our public API. -->
         <dependency id="System.Data.Common" version="4.3.0" />
         <dependency id="System.Diagnostics.DiagnosticSource" version="10.0.3" />
         <dependency id="System.Memory" version="4.6.3" />