- Removed .NET 10 from PR pipeline test runs; it remains for CI pipeline test runs.

- Removed unnecessary System.Text.Json and Microsoft.Win32.Registry package dependencies that were causing pruning warnings.
- Updated MDS .nuspec dependencies to match what we actually depend on.

Author: paulmedynski

Directory.Packages.props

@@ -31,7 +31,6 @@
     <PackageVersion Include="Microsoft.SqlServer.SqlManagementObjects" Version="172.76.0" />
     <PackageVersion Include="Microsoft.SqlServer.Types" Version="160.1000.6" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
-    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.Data.Odbc" Version="9.0.9" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="5.0.0" />
@@ -69,13 +68,11 @@
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.9" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.9" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.9" />
   </ItemGroup>
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="8.0.0" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="8.0.1" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
   </ItemGroup>
   <!-- .NET Dependencies -->
   <ItemGroup>
@@ -90,6 +87,7 @@
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
     <PackageVersion Include="System.ValueTuple" Version="4.6.1" />
     <PackageVersion Include="System.Threading.Channels" Version="8.0.0" />
   </ItemGroup>

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -320,7 +320,7 @@ stages:
         windows_sql_22_named_instance:
           pool: ${{parameters.defaultPoolName }}
           images:
-            Win22_Sql22_named_instance: ADO-MMS22-SQL22-WITH-NAMED-INSTANCE
+            Win22_Sql22_Named_Instance: ADO-MMS22-SQL22-WITH-NAMED-INSTANCE
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -344,7 +344,7 @@ stages:
           pool: ${{parameters.defaultPoolName }} 
           images: 
             Win22_Azure_Sql: ADO-MMS22-SQL19
-            win11_Azure_Sql: ADO-CI-Win11
+            Win11_Azure_Sql: ADO-CI-Win11
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}
@@ -376,7 +376,7 @@ stages:
         windows_azure_arm64_sql:
           pool: ADO-CI-PUBLIC-ARM64-1ES-EUS-POOL
           images: 
-            Win22_Azure_ARM64_Sql: ADO-WIN11-ARM64
+            Win11_ARM64_Azure_Sql: ADO-WIN11-ARM64
           TargetFrameworks: ${{parameters.targetFrameworks }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: ${{parameters.buildPlatforms }}

eng/pipelines/sqlclient-pr-package-ref-pipeline.yml

@@ -85,19 +85,25 @@ parameters:
   #
   # These are _not_ the target frameworks to build the driver packages for.
   #
+  # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
+  # during PR pipeline runs.  The periodic CI pipeline runs include .NET 10.0.
+  #
   - name: targetFrameworks
     displayName: Target Frameworks on Windows
     type: object
-    default: [net462, net8.0, net9.0, net10.0]
+    default: [net462, net8.0, net9.0]
 
   # The target frameworks to build and run tests for on Unix.
   #
   # These are _not_ the target frameworks to build the driver packages for.
   #
+  # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
+  # during PR pipeline runs.  The periodic CI pipeline runs include .NET 10.0.
+  #
   - name: targetFrameworksUnix
     displayName: Target Frameworks on Unix
     type: object
-    default: [net8.0, net9.0, net10.0]
+    default: [net8.0, net9.0]
 
   - name: testSets
     displayName: Test Sets

eng/pipelines/sqlclient-pr-project-ref-pipeline.yml

@@ -85,19 +85,25 @@ parameters:
   #
   # These are _not_ the target frameworks to build the driver packages for.
   #
+  # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
+  # during PR pipeline runs.  The periodic CI pipeline runs include .NET 10.0.
+  #
   - name: targetFrameworks
     displayName: Target Frameworks on Windows
     type: object
-    default: [net462, net8.0, net9.0, net10.0]
+    default: [net462, net8.0, net9.0]
 
   # The target frameworks to build and run tests for on Unix.
   #
   # These are _not_ the target frameworks to build the driver packages for.
   #
+  # Note: We are excluding .NET 10.0 here to avoid consuming too many resources
+  # during PR pipeline runs.  The periodic CI pipeline runs include .NET 10.0.
+  #
   - name: targetFrameworksUnix
     displayName: Target Frameworks on Unix
     type: object
-    default: [net8.0, net9.0, net10.0]
+    default: [net8.0, net9.0]
 
   - name: testSets
     displayName: Test Sets

src/Directory.Build.props

@@ -99,7 +99,7 @@
       error.  This list should be used sparingly to avoid important warnings
       being ignored.
     -->
-    <WarningsNotAsErrors Condition="$(MSBuildRuntimeType) == 'Full'">NU1510</WarningsNotAsErrors>
+    <WarningsNotAsErrors></WarningsNotAsErrors>
 
     <!--
       If a build is failing due to vulnerable dependencies, you may temporarily

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj

@@ -45,11 +45,6 @@
 
   </ItemGroup>
 
-  <!-- System.Text.Json is included in .NET 10+ BCL -->
-  <ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
-    <PackageReference Include="System.Text.Json" />
-  </ItemGroup>
-
   <!-- netstandard dependencies -->
   <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
     <PackageReference Include="System.Threading.Channels" />

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

@@ -1106,11 +1106,6 @@
     <PackageReference Include="System.Security.Cryptography.Pkcs" />
   </ItemGroup>
 
-  <!-- System.Text.Json is included in .NET 10+ BCL -->
-  <ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
-    <PackageReference Include="System.Text.Json" />
-  </ItemGroup>
-
   <Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
   <Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />
   <Import Project="$(ToolsDir)targets\NotSupported.targets" Condition="'$(OSGroup)' == 'AnyOS'" />

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -54,10 +54,6 @@
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <Utf8Output>True</Utf8Output>
     <ErrorReport>None</ErrorReport>
-
-    <!-- This code analysis ruleset only exists with the .NET Framework toolset. -->
-    <CodeAnalysisRuleSet Condition="$(MSBuildRuntimeType) == 'Full'">MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-
     <BuildProjectReferences>True</BuildProjectReferences>
     <GenerateAssemblyRefs>True</GenerateAssemblyRefs>
     <DefineConstants>$(DefineConstants);USEOFFSET;CODE_ANALYSIS_BASELINE;FEATURE_LEGACYSURFACEAREA;FEATURE_UTF32;FEATURE_UTF7;TRACE;</DefineConstants>

src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj

@@ -331,9 +331,6 @@
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
     <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Win32.Registry" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(AddOnsPath)AzureKeyVaultProvider\Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj" />
     <PackageReference Include="Azure.Identity" />

tools/specs/Microsoft.Data.SqlClient.nuspec

@@ -37,13 +37,13 @@
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
         <dependency id="System.Buffers" version="4.6.1" />
-        <dependency id="System.Data.Common" version="4.3.0" />
         <dependency id="System.Diagnostics.DiagnosticSource" version="8.0.1" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
+        <dependency id="System.Memory" version="4.6.3" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
         <dependency id="System.Text.Encodings.Web" version="8.0.0" />
         <dependency id="System.Text.Json" version="8.0.6" />
         <dependency id="System.Threading.Channels" version="8.0.0" />
+        <dependency id="System.ValueTuple" version="4.6.1" />
       </group>
       <group targetFramework="net8.0">
         <dependency id="Azure.Core" version="1.49.0" />
@@ -55,23 +55,19 @@
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
         <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
-        <dependency id="System.Text.Json" version="8.0.6" />
       </group>
       <group targetFramework="net9.0">
         <dependency id="Azure.Core" version="1.49.0" />
         <dependency id="Azure.Identity" version="1.16.0" />
         <dependency id="Microsoft.Bcl.Cryptography" version="9.0.9" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
-        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.5" exclude="Compile" />
+        <dependency id="Microsoft.Extensions.Caching.Memory" version="9.0.9" exclude="Compile" />
         <dependency id="Microsoft.IdentityModel.JsonWebTokens" version="8.14.0" />
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
         <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
         <dependency id="System.Configuration.ConfigurationManager" version="9.0.9" exclude="Compile" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
         <dependency id="System.Security.Cryptography.Pkcs" version="9.0.9" />
-        <dependency id="System.Text.Json" version="9.0.9" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="Azure.Core" version="1.49.0" />
@@ -83,9 +79,7 @@
         <dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="8.14.0" />
         <dependency id="Microsoft.SqlServer.Server" version="1.0.0" />
         <dependency id="System.Configuration.ConfigurationManager" version="8.0.1" exclude="Compile" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" />
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
-        <dependency id="System.Text.Json" version="8.0.6" />
         <dependency id="System.Threading.Channels" version="8.0.0" />
       </group>
     </dependencies>