Adding support for .NET 10

Directory.Packages.props

@@ -12,11 +12,11 @@
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.78.0" />
   </ItemGroup>
   <!-- Published - Target Framework Specific Dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <!-- MDS and AKV -->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">   
     <!-- MDS and AKV -->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
   </ItemGroup>
@@ -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" />
@@ -42,11 +41,11 @@
     <PackageVersion Include="xunit.runner.console" Version="2.9.3" />
   </ItemGroup>
   <!-- Internal - Target Framework Specific Dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <!-- MDS and AKV Tests -->
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <!-- MDS and AKV Tests -->
     <!--
       We can't use a newer major version of this package because it pulls in
@@ -65,17 +64,15 @@
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
   <!-- Common Target Framework Specific Dependencies -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">    
     <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="'$(TargetFramework)' != 'net9.0'">
+  <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>
@@ -101,4 +99,4 @@
   <!-- =================================================================== -->
   <!-- MSS Dependencies -->
   <!-- None -->
-</Project>
+</Project>

eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml

@@ -63,6 +63,11 @@ jobs:
       - template: ../steps/ensure-dotnet-version.yml@self
         parameters:
             packageType: sdk
+            version: '10.0'
+
+      - template: ../steps/ensure-dotnet-version.yml@self
+        parameters:
+            packageType: runtime
             version: '9.0'
 
       - pwsh: |

eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml

@@ -32,9 +32,15 @@ steps:
     retryCount: 5
 
 - task: UseDotNet@2
-  displayName: 'Use .NET 9.x sdk'
+  displayName: 'Use .NET 10.x sdk'
   inputs:
     packageType: sdk
+    version: '10.x'
+
+- task: UseDotNet@2
+  displayName: 'Use .NET 9.x runtime'
+  inputs:
+    packageType: runtime
     version: '9.x'
 
 - task: UseDotNet@2

eng/pipelines/common/templates/steps/ci-prebuild-step.yml

@@ -29,6 +29,12 @@ steps:
   parameters:
     packageType: sdk
     usePreview: false
+    version: 10.0
+
+- template: ensure-dotnet-version.yml
+  parameters:
+    packageType: runtime
+    usePreview: false
     version: 9.0
 
 - template: ensure-dotnet-version.yml

eng/pipelines/common/templates/steps/ci-project-build-step.yml

@@ -40,6 +40,11 @@ steps:
 - template: ./ensure-dotnet-version.yml@self
   parameters:
       packageType: 'sdk'
+      version: '10.0'
+
+- template: ./ensure-dotnet-version.yml@self
+  parameters:
+      packageType: 'runtime'
       version: '9.0'
 
 - template: ./ensure-dotnet-version.yml@self

eng/pipelines/common/templates/steps/pre-build-step.yml

@@ -7,6 +7,12 @@ steps:
 - template: ./ensure-dotnet-version.yml@self
   parameters:
     packageType: 'sdk'
+    version: '10.0'
+    usePreview: false
+
+- template: ./ensure-dotnet-version.yml@self
+  parameters:
+    packageType: 'runtime'
     version: '9.0'
 
 - template: ./ensure-dotnet-version.yml@self

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

@@ -9,20 +9,28 @@ parameters:
   type: boolean
   default: false
 
+# The target frameworks to build and run tests for on Windows.
+#
+# These are _not_ the target frameworks to build the driver packages for.
+#
 - name: targetFrameworks
   displayName: 'Target Frameworks on Windows'
   type: object
-  default: [net462, net8.0, net9.0]
-
-- name: targetFrameworksLinux
-  displayName: 'Target Frameworks on Non-Windows'
+  default: [net462, net8.0, net9.0, net10.0]
+
+# The target frameworks to build and run tests for on Unix.
+#
+# These are _not_ the target frameworks to build the driver packages for.
+#
+- name: targetFrameworksUnix
+  displayName: 'Target Frameworks on Unix'
   type: object
-  default: [net8.0, net9.0]
+  default: [net8.0, net9.0, net10.0]
 
 - name: netcoreVersionTestUtils
   displayName: 'Netcore Version for Test Utilities'
   type: object
-  default: net9.0
+  default: net10.0
 
 - name: buildPlatforms
   displayName: 'Build Platforms on Windows'
@@ -53,10 +61,12 @@ parameters:
   type: string
   default: https://sqlclientdrivers.pkgs.visualstudio.com/ADO.Net/_packaging/SNIValidation/nuget/v3/index.json
 
+# Frameworks to expect code coverage information for, and to compile into
+# reports.
 - name: codeCovTargetFrameworks
   displayName: 'Code Coverage Target Frameworks'
   type: object
-  default: [net462, net8.0, net9.0]
+  default: [net462, net8.0, net9.0, net10.0]
 
 - name: buildType
   displayName: 'Build Type'
@@ -310,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 }}
@@ -334,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 }}
@@ -366,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 }}
@@ -431,7 +441,7 @@ stages:
           images:
             Ubuntu20_Sql22: ADO-UB20-SQL22 # drop testing against UB20 image post April 2025
             Ubuntu22_Sql22: ADO-UB22-SQL22
-          TargetFrameworks: ${{parameters.targetFrameworksLinux }}
+          TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
           testSets: ${{parameters.testSets }}
@@ -456,7 +466,7 @@ stages:
           pool: ${{parameters.defaultPoolName }}
           images:
             Ubuntu22_Azure_Sql: ADO-UB22-SQL22
-          TargetFrameworks: ${{parameters.targetFrameworksLinux }}
+          TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
           testSets: ${{parameters.testSets }}
@@ -488,7 +498,7 @@ stages:
             pool: ADO-CI-AE-1ES-Pool
             images:
               Ubuntu20_Enclave_Sql19: ADO-UB22-Sql22
-            TargetFrameworks: ${{parameters.targetFrameworksLinux }}
+            TargetFrameworks: ${{parameters.targetFrameworksUnix }}
             netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
             buildPlatforms: [AnyCPU]
             testSets: [AE]
@@ -518,7 +528,7 @@ stages:
           hostedPool: true
           images:
             MacOSLatest_Sql22: macos-latest
-          TargetFrameworks: ${{parameters.targetFrameworksLinux }}
+          TargetFrameworks: ${{parameters.targetFrameworksUnix }}
           netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
           buildPlatforms: [AnyCPU]
           testSets: ${{parameters.testSets }}

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

@@ -124,15 +124,23 @@ parameters:
     type: boolean
     default: false
 
+  # The target frameworks to build and run tests for on Windows.
+  #
+  # These are _not_ the target frameworks to build the driver packages for.
+  #
   - name: targetFrameworks
     displayName: Target Frameworks on Windows
     type: object
-    default: [net462, net8.0, net9.0]
-
-  - name: targetFrameworksLinux
-    displayName: Target Frameworks on Non-Windows
+    default: [net462, net8.0, net9.0, net10.0]
+
+  # The target frameworks to build and run tests for on Unix.
+  #
+  # These are _not_ the target frameworks to build the driver packages for.
+  #
+  - name: targetFrameworksUnix
+    displayName: Target Frameworks on Unix
     type: object
-    default: [net8.0, net9.0]
+    default: [net8.0, net9.0, net10.0]
 
   - name: testSets
     displayName: Test Sets
@@ -162,7 +170,7 @@ extends:
     debug: ${{ parameters.debug }}
     enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
-    targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
+    targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testSets: ${{ parameters.testSets }}
     # Populate the actual test job timeout numeric values if Default was
     # specified.  We choose different values depending on the build

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

@@ -124,15 +124,23 @@ parameters:
     type: boolean
     default: false
 
+  # The target frameworks to build and run tests for on Windows.
+  #
+  # These are _not_ the target frameworks to build the driver packages for.
+  #
   - name: targetFrameworks
     displayName: Target Frameworks on Windows
     type: object
-    default: [net462, net8.0, net9.0]
-
-  - name: targetFrameworksLinux
-    displayName: Target Frameworks on Non-Windows
+    default: [net462, net8.0, net9.0, net10.0]
+
+  # The target frameworks to build and run tests for on Unix.
+  #
+  # These are _not_ the target frameworks to build the driver packages for.
+  #
+  - name: targetFrameworksUnix
+    displayName: Target Frameworks on Unix
     type: object
-    default: [net8.0, net9.0]
+    default: [net8.0, net9.0, net10.0]
 
   - name: testSets
     displayName: Test Sets
@@ -162,7 +170,7 @@ extends:
     debug: ${{ parameters.debug }}
     enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
-    targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
+    targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testSets: ${{ parameters.testSets }}
     # Populate the actual test job timeout numeric values if Default was
     # specified.  We choose different values depending on the build

eng/pipelines/libraries/ci-build-variables.yml

@@ -11,8 +11,6 @@ variables:
 
   - name: buildNumber
     value: '$(Build.BuildNumber)'
-  - name: TFNetCore
-    value: 'net8.0'
   - name: SQLTarget
     value: 'localhost'
   - name: NugetPackageVersion

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

@@ -81,13 +81,27 @@ parameters:
     type: boolean
     default: false
 
+  # The target frameworks to build and run tests for on Windows.
+  #
+  # 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]
 
-  - name: targetFrameworksLinux
-    displayName: Target Frameworks on Non-Windows
+  # 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]
 
@@ -119,7 +133,7 @@ extends:
     debug: ${{ parameters.debug }}
     enableStressTests: ${{ parameters.enableStressTests }}
     targetFrameworks: ${{ parameters.targetFrameworks }}
-    targetFrameworksLinux: ${{ parameters.targetFrameworksLinux }}
+    targetFrameworksUnix: ${{ parameters.targetFrameworksUnix }}
     testSets: ${{ parameters.testSets }}
     # Populate the actual test job timeout numeric values if Default was
     # specified.  We choose different values depending on the build