From 06268d19a521824af1a905256db78a9e5636acef Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Wed, 10 Dec 2025 19:29:56 -0400
Subject: [PATCH 1/8] - Removed unused dependencies across all driver and test
projects. - Updated some dependencies, avoiding transitive vulnerabilities. -
Updated nuspec files to remove/update dependencies accordingly.
---
...waysEncrypted.AzureKeyVaultProvider.csproj | 1 -
.../ref/Microsoft.Data.SqlClient.csproj | 1 -
.../src/Microsoft.Data.SqlClient.csproj | 1 -
.../netfx/ref/Microsoft.Data.SqlClient.csproj | 2 --
.../netfx/src/Microsoft.Data.SqlClient.csproj | 2 --
.../Microsoft.Data.SqlClient.Tests.csproj | 1 -
....Data.SqlClient.ManualTesting.Tests.csproj | 1 -
...crosoft.Data.SqlClient.ExtUtilities.csproj | 8 +++++++
...rosoft.Data.SqlClient.TestUtilities.csproj | 2 --
tools/props/Versions.props | 24 +++++++------------
tools/props/VersionsNet9OrLater.props | 3 +--
tools/specs/Microsoft.Data.SqlClient.nuspec | 22 +++++++----------
...waysEncrypted.AzureKeyVaultProvider.nuspec | 14 +++++------
13 files changed, 34 insertions(+), 48 deletions(-)
diff --git a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
index 294a5c02b2..7c6a76eabb 100644
--- a/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/add-ons/AzureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
@@ -38,7 +38,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index b587305bb5..8b1897a4d9 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -35,7 +35,6 @@
-
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 63256d721a..23e858969a 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -862,7 +862,6 @@
-
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 d21d3868f6..bbf3a26017 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -33,7 +33,6 @@
-
$(MicrosoftDataSqlClientSniVersion)
All
@@ -45,7 +44,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 26b95d1871..ee516dc670 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -875,7 +875,6 @@
-
$(MicrosoftDataSqlClientSniVersion)
All
@@ -887,7 +886,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index 83cadc2092..24092fae6a 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -103,7 +103,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index e901c019fc..d8145433d9 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -359,7 +359,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
index 7cb8f9a46c..bbcbdccb5d 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
@@ -7,6 +7,14 @@
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 173c4895ca..8f77019b69 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -17,7 +17,5 @@
-
-
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 03e4ff61f1..417bdfb1a6 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -24,18 +24,16 @@
6.0.2
- 4.5.1
+ 4.6.1
4.5.5
- 8.0.0
- 8.0.5
+ 8.0.6
1.14.2
- 8.0.0
8.0.1
- 7.5.0
- 7.5.0
+ 7.7.1
+ 7.7.1
4.3.0
8.0.1
@@ -47,31 +45,27 @@
- [1.47.1,2.0.0)
- [4.7.0,5.0.0)
+ 1.50.0
+ 4.8.0
0.13.2
- 3.1.6
10.0.0-beta.25164.6
10.0.0-beta.25164.6
8.0.1
1.0.3
- 17.11.1
+ 17.12.0
172.52.0
10.50.1600.1
160.1000.6
5.0.0
- 13.0.3
+ 13.0.4
8.0.1
- 6.0.1
4.3.0
- 5.0.0
5.0.0
8.0.1
- 6.0.0
- 2.9.2
+ 2.9.3
2.8.2
diff --git a/tools/props/VersionsNet9OrLater.props b/tools/props/VersionsNet9OrLater.props
index 4b9e30bd77..66f8edadfe 100644
--- a/tools/props/VersionsNet9OrLater.props
+++ b/tools/props/VersionsNet9OrLater.props
@@ -2,8 +2,7 @@
- 9.0.4
- 9.0.4
+ 9.0.11
9.0.4
9.0.4
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 84799de4aa..152c72a145 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -30,34 +30,30 @@ When using NuGet 3.x this package requires at least version 3.4.
-
-
-
-
+
+
+
-
-
+
-
-
-
+
+
-
-
-
-
+
+
+
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
index 075ca0ecad..a3c348f40a 100644
--- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
+++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -26,21 +26,21 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
-
-
+
+
-
-
+
+
-
-
-
+
+
+
From 609e8e9aaba2581fba59a77f7fd766e17da0a5a7 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 11 Dec 2025 15:29:16 -0400
Subject: [PATCH 2/8] - Backpedaled on the AKV package upgrades since they
bring in Syatem.Text.Json 8.
---
tools/props/Versions.props | 4 ++--
...ient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 12 ++++++------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 417bdfb1a6..b42d9d063c 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -45,8 +45,8 @@
- 1.50.0
- 4.8.0
+ 1.47.1
+ 4.7.0
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
index a3c348f40a..d750a523f1 100644
--- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
+++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -26,20 +26,20 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
-
-
+
+
-
-
+
+
-
-
+
+
From a3b75503cc323af16b45aa274a1e4901610bbde8 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Fri, 12 Dec 2025 16:01:31 -0400
Subject: [PATCH 3/8] - Removed Pkcs package from .NET Framework. - Cleaned up
MSS project and package refs.
---
.../netcore/src/Microsoft.Data.SqlClient.csproj | 2 --
.../netfx/ref/Microsoft.Data.SqlClient.csproj | 1 -
.../netfx/src/Microsoft.Data.SqlClient.csproj | 1 -
.../FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj | 2 --
.../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj | 2 --
.../ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj | 6 +++++-
.../tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj | 6 +++++-
.../tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj | 6 +++++-
.../SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj | 6 +++++-
.../Microsoft.Data.SqlClient.TestUtilities.csproj | 1 -
tools/props/Versions.props | 4 ++--
tools/specs/Microsoft.Data.SqlClient.nuspec | 1 -
12 files changed, 22 insertions(+), 16 deletions(-)
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 23e858969a..b0133be000 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -854,8 +854,6 @@
-
-
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 bbf3a26017..6dc8b2228c 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -43,7 +43,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index ee516dc670..67e599404b 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -885,7 +885,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index 24092fae6a..89d2ceecaa 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -102,7 +102,6 @@
-
@@ -126,7 +125,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index d8145433d9..f7462874d6 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -324,7 +324,6 @@
-
@@ -358,7 +357,6 @@
-
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index 941b08588c..b618daf6c5 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -8,10 +8,14 @@
$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)
$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)
+
-
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 93137d1883..f6bfb94076 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -8,10 +8,14 @@
$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)
$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)
+
-
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 596f7ffe74..6bdf3f7d39 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -8,10 +8,14 @@
$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)
$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)
+
-
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index ec1229e0e7..235175787c 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -8,10 +8,14 @@
$(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)
$(BinFolder)$(Configuration).$(Platform)\$(AssemblyName)
+
-
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
index 8f77019b69..7929f589a1 100644
--- a/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj
@@ -14,7 +14,6 @@
PreserveNewest
-
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index b42d9d063c..fe9956d3e0 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -35,13 +35,13 @@
7.7.1
7.7.1
4.3.0
- 8.0.1
6.0.2
- 8.0.1
1.0.0
+ 8.0.1
+ 8.0.1
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 152c72a145..64a847a68c 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -35,7 +35,6 @@ When using NuGet 3.x this package requires at least version 3.4.
-
From 2bc20494a0c18af2e5bfcdc6d22275e91a7246b9 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 8 Jan 2026 10:59:39 -0400
Subject: [PATCH 4/8] Added Microsoft.Identity.Client 4.80.0 as a new direct
dependency.
---
.../netcore/ref/Microsoft.Data.SqlClient.csproj | 1 +
.../netcore/src/Microsoft.Data.SqlClient.csproj | 1 +
.../netfx/ref/Microsoft.Data.SqlClient.csproj | 1 +
.../netfx/src/Microsoft.Data.SqlClient.csproj | 1 +
.../SqlClient/ActiveDirectoryAuthenticationProvider.cs | 2 ++
.../CustomRetryLogicProvider.csproj | 10 ++++++++++
.../tests/ManualTests/DataCommon/DataTestUtility.cs | 2 ++
.../SQL/ConnectivityTests/AADConnectionTest.cs | 2 ++
.../SQL/UdtTest/UDTs/Address/Address.csproj | 10 ++++++++++
.../ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj | 10 ++++++++++
.../ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj | 10 ++++++++++
.../SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj | 10 ++++++++++
tools/props/Versions.props | 1 +
tools/props/VersionsNet9OrLater.props | 2 ++
tools/specs/Microsoft.Data.SqlClient.nuspec | 3 +++
15 files changed, 66 insertions(+)
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index 8b1897a4d9..2fbea51379 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -31,6 +31,7 @@
+
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 b0133be000..da49a092a5 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -856,6 +856,7 @@
+
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 6dc8b2228c..105389a78a 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -39,6 +39,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 67e599404b..1de932d048 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -881,6 +881,7 @@
runtime; build; native; contentfiles; analyzers; buildtransitive
+
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
index e1a86c4b97..e0351a40b8 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
@@ -261,10 +261,12 @@ previousPw is byte[] previousPwBytes &&
if (result == null)
{
+ #pragma warning disable CS0618 // Type or member is obsolete
result = await app.AcquireTokenByUsernamePassword(scopes, parameters.UserId, parameters.Password)
.WithCorrelationId(parameters.ConnectionId)
.ExecuteAsync(cancellationToken: cts.Token)
.ConfigureAwait(false);
+ #pragma warning disable CS0618 // Type or member is obsolete
// We cache the password hash to ensure future connection requests include a validated password
// when we check for a cached MSAL account. Otherwise, a connection request with the same username
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index 8a076d1e52..6a69eed91a 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -15,4 +15,14 @@
+
+
+
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
index b2d05cf3f1..2bbd22189d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/DataCommon/DataTestUtility.cs
@@ -284,7 +284,9 @@ private static Task AcquireTokenAsync(string authorityURL, string userID
SecureString securePassword = new SecureString();
securePassword.MakeReadOnly();
+ #pragma warning disable CS0618 // Type or member is obsolete
result = app.AcquireTokenByUsernamePassword(scopes, userID, password).ExecuteAsync().Result;
+ #pragma warning restore CS0618 // Type or member is obsolete
return result.AccessToken;
});
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
index a61d9039ad..7a563e0cfb 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs
@@ -40,11 +40,13 @@ public override async Task AcquireTokenAsync(SqlAuthenti
string[] scopes = new string[] { scope };
SecureString password = new SecureString();
+ #pragma warning disable CS0618 // Type or member is obsolete
AuthenticationResult result = await PublicClientApplicationBuilder.Create(_appClientId)
.WithAuthority(parameters.Authority)
.Build().AcquireTokenByUsernamePassword(scopes, parameters.UserId, parameters.Password)
.WithCorrelationId(parameters.ConnectionId)
.ExecuteAsync(cancellationToken: cts.Token);
+ #pragma warning restore CS0618 // Type or member is obsolete
return new SqlAuthenticationToken(result.AccessToken, result.ExpiresOn);
}
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index b618daf6c5..d300b3844b 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -18,4 +18,14 @@
+
+
+
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index f6bfb94076..56fc9fbe59 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -18,4 +18,14 @@
+
+
+
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 6bdf3f7d39..553ea04479 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -18,4 +18,14 @@
+
+
+
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index 235175787c..43e838e374 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -18,4 +18,14 @@
+
+
+
+
+
+
+
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index fe9956d3e0..44550d5c0e 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -32,6 +32,7 @@
1.14.2
8.0.1
+ 4.80.0
7.7.1
7.7.1
4.3.0
diff --git a/tools/props/VersionsNet9OrLater.props b/tools/props/VersionsNet9OrLater.props
index 66f8edadfe..d60c61407d 100644
--- a/tools/props/VersionsNet9OrLater.props
+++ b/tools/props/VersionsNet9OrLater.props
@@ -2,7 +2,9 @@
+ 9.0.11
9.0.11
+ 9.0.11
9.0.4
9.0.4
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index 64a847a68c..ed0758403b 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -32,6 +32,7 @@ When using NuGet 3.x this package requires at least version 3.4.
+
@@ -41,6 +42,7 @@ When using NuGet 3.x this package requires at least version 3.4.
+
@@ -51,6 +53,7 @@ When using NuGet 3.x this package requires at least version 3.4.
+
From ac4917b680a03a9573907c5f8a5519a8afdf4c8f Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 8 Jan 2026 13:15:53 -0400
Subject: [PATCH 5/8] - Added Azure.Core as a direct dependency. - Upgraded
Azure.Core, Azure.Identity, and Azure.Security.KeyVault.Keys.
---
.../netcore/ref/Microsoft.Data.SqlClient.csproj | 3 ++-
.../netcore/src/Microsoft.Data.SqlClient.csproj | 3 ++-
.../netfx/ref/Microsoft.Data.SqlClient.csproj | 5 +++--
.../netfx/src/Microsoft.Data.SqlClient.csproj | 5 +++--
tools/props/Versions.props | 6 +++---
tools/specs/Microsoft.Data.SqlClient.nuspec | 9 ++++++---
...ient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec | 12 ++++++------
7 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
index 2fbea51379..e9e3c8da04 100644
--- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
@@ -27,10 +27,11 @@
+
+
-
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 da49a092a5..148d4be3c4 100644
--- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
@@ -852,10 +852,11 @@
+
+
-
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 105389a78a..8bb292ade9 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -32,13 +32,14 @@
-
+
+
$(MicrosoftDataSqlClientSniVersion)
All
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index 1de932d048..e8f2b2afe9 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -874,13 +874,14 @@
-
+
+
$(MicrosoftDataSqlClientSniVersion)
All
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 44550d5c0e..1246fc2eff 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -30,7 +30,8 @@
- 1.14.2
+ 1.50.0
+ 1.17.1
8.0.1
4.80.0
7.7.1
@@ -46,8 +47,7 @@
- 1.47.1
- 4.7.0
+ 4.8.0
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index ed0758403b..faebcba7a5 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -29,7 +29,8 @@ When using NuGet 3.x this package requires at least version 3.4.
sqlclient microsoft.data.sqlclient
-
+
+
@@ -39,7 +40,8 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+
+
@@ -50,7 +52,8 @@ When using NuGet 3.x this package requires at least version 3.4.
-
+
+
diff --git a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
index d750a523f1..a3c348f40a 100644
--- a/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
+++ b/tools/specs/add-ons/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.nuspec
@@ -26,20 +26,20 @@ Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyStoreProvider.SqlColumnEncrypti
-
-
+
+
-
-
+
+
-
-
+
+
From 4220edaf0b03d7ff8c77bd834c48604ae988066d Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 8 Jan 2026 14:38:10 -0400
Subject: [PATCH 6/8] Addressed Copilot comments.
---
.../Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs | 2 +-
.../CustomRetryLogicProvider.csproj | 2 +-
.../tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj | 2 +-
.../tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj | 2 +-
.../tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj | 2 +-
.../ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
index e0351a40b8..5fb7cba451 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
@@ -266,7 +266,7 @@ previousPw is byte[] previousPwBytes &&
.WithCorrelationId(parameters.ConnectionId)
.ExecuteAsync(cancellationToken: cts.Token)
.ConfigureAwait(false);
- #pragma warning disable CS0618 // Type or member is obsolete
+ #pragma warning restore CS0618 // Type or member is obsolete
// We cache the password hash to ensure future connection requests include a validated password
// when we check for a cached MSAL account. Otherwise, a connection request with the same username
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index 6a69eed91a..78faf649ef 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -18,7 +18,7 @@
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index d300b3844b..73c4c208b3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -21,7 +21,7 @@
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 56fc9fbe59..028d701e58 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -21,7 +21,7 @@
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index 553ea04479..d0e998d02e 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -21,7 +21,7 @@
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index 43e838e374..ef5e575b9d 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -21,7 +21,7 @@
From 1223be07b9e5c37d4b18c8d7c9c2825c5f560ef6 Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Thu, 8 Jan 2026 14:44:39 -0400
Subject: [PATCH 7/8] Fixed new deprecation warning.
---
.../Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
index 5fb7cba451..462fbd575c 100644
--- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
+++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ActiveDirectoryAuthenticationProvider.cs
@@ -586,7 +586,9 @@ private static TokenCredentialData CreateTokenCredentialInstance(TokenCredential
if (tokenCredentialKey._clientId is not null)
{
defaultAzureCredentialOptions.ManagedIdentityClientId = tokenCredentialKey._clientId;
+ #pragma warning disable CS0618 // Type or member is obsolete
defaultAzureCredentialOptions.SharedTokenCacheUsername = tokenCredentialKey._clientId;
+ #pragma warning restore CS0618 // Type or member is obsolete
defaultAzureCredentialOptions.WorkloadIdentityClientId = tokenCredentialKey._clientId;
}
From 85fee5d5bdc7dda15f13699a0e50adfee63746ec Mon Sep 17 00:00:00 2001
From: Paul Medynski <31868385+paulmedynski@users.noreply.github.com>
Date: Mon, 12 Jan 2026 10:17:03 -0400
Subject: [PATCH 8/8] - Added Pkcs back to net462. - Fixed some build errors
exposed by the dotnet CLI.
---
build.proj | 2 +-
.../netfx/ref/Microsoft.Data.SqlClient.csproj | 6 ++++++
.../netfx/src/Microsoft.Data.SqlClient.csproj | 6 ++++++
.../CustomRetryLogicProvider.csproj | 1 +
.../Microsoft.Data.SqlClient.Tests.csproj | 9 +++++++++
.../Microsoft.Data.SqlClient.ManualTesting.Tests.csproj | 9 +++++++++
.../ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj | 1 +
.../ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj | 1 +
.../ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj | 1 +
.../SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj | 1 +
tools/props/Versions.props | 2 +-
tools/specs/Microsoft.Data.SqlClient.nuspec | 1 +
tools/targets/NotSupported.targets | 2 +-
13 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/build.proj b/build.proj
index efa250d1a0..a0f99bdc8d 100644
--- a/build.proj
+++ b/build.proj
@@ -108,7 +108,7 @@
- $(DotNetCmd) dotnet build -c Release -p:ReferenceType=$(ReferenceType)
+ $(DotnetPath)dotnet build -c Release -p:ReferenceType=$(ReferenceType)
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 8bb292ade9..c781775d5a 100644
--- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj
@@ -44,6 +44,12 @@
+
+
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
index e8f2b2afe9..d536348241 100644
--- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
+++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj
@@ -886,6 +886,12 @@
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
index 78faf649ef..60795bfa00 100644
--- a/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj
@@ -24,5 +24,6 @@
+
diff --git a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
index 89d2ceecaa..20dfc9bec9 100644
--- a/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
@@ -106,6 +106,15 @@
+
+
+
+
+
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
index f7462874d6..814d66831a 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@@ -358,6 +358,15 @@
+
+
+
+
+
+
PreserveNewest
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
index 73c4c208b3..c95df85cf3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj
@@ -27,5 +27,6 @@
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
index 028d701e58..2657bef7cd 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj
@@ -27,5 +27,6 @@
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
index d0e998d02e..c4d78021ce 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Shapes/Shapes.csproj
@@ -27,5 +27,6 @@
+
diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
index ef5e575b9d..1af2b9acf3 100644
--- a/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
+++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj
@@ -27,5 +27,6 @@
+
diff --git a/tools/props/Versions.props b/tools/props/Versions.props
index 1246fc2eff..cf79d3d589 100644
--- a/tools/props/Versions.props
+++ b/tools/props/Versions.props
@@ -37,13 +37,13 @@
7.7.1
7.7.1
4.3.0
+ 8.0.1
6.0.2
1.0.0
8.0.1
- 8.0.1
diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec
index faebcba7a5..bd79f60b81 100644
--- a/tools/specs/Microsoft.Data.SqlClient.nuspec
+++ b/tools/specs/Microsoft.Data.SqlClient.nuspec
@@ -37,6 +37,7 @@ When using NuGet 3.x this package requires at least version 3.4.
+
diff --git a/tools/targets/NotSupported.targets b/tools/targets/NotSupported.targets
index 890c4ae048..504b8ffbf9 100644
--- a/tools/targets/NotSupported.targets
+++ b/tools/targets/NotSupported.targets
@@ -42,7 +42,7 @@
$(GenAPIArgs) -o:"$(NotSupportedSourceFile)"
$(GenAPIArgs) -t:"$(GeneratePlatformNotSupportedAssemblyMessage)"
$(GenAPIArgs) -global
- "$(DotNetCmd) $(ToolsArtifactsDir)$(TargetFramework)\Microsoft.DotNet.GenAPI.dll"
+ $(DotnetPath)dotnet "$(ToolsArtifactsDir)net8.0\Microsoft.DotNet.GenAPI.dll"
"$(ToolsArtifactsDir)net472\Microsoft.DotNet.GenAPI.exe"