diff --git a/Directory.Packages.props b/Directory.Packages.props index 974cd4573c..c339554838 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -12,11 +12,11 @@ - + - + @@ -31,7 +31,6 @@ - @@ -42,11 +41,11 @@ - + - + - + - - + - @@ -86,10 +82,10 @@ - - + + @@ -101,4 +97,4 @@ - \ No newline at end of file + diff --git a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml b/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml index f246d803cc..d849ef27a7 100644 --- a/eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml +++ b/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: | diff --git a/eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml b/eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml index bf2d9fa905..ef19650643 100644 --- a/eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml +++ b/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 diff --git a/eng/pipelines/common/templates/steps/ci-prebuild-step.yml b/eng/pipelines/common/templates/steps/ci-prebuild-step.yml index 115186c2e2..4920482059 100644 --- a/eng/pipelines/common/templates/steps/ci-prebuild-step.yml +++ b/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 diff --git a/eng/pipelines/common/templates/steps/ci-project-build-step.yml b/eng/pipelines/common/templates/steps/ci-project-build-step.yml index f8f4f94f05..2b40aa8216 100644 --- a/eng/pipelines/common/templates/steps/ci-project-build-step.yml +++ b/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 diff --git a/eng/pipelines/common/templates/steps/pre-build-step.yml b/eng/pipelines/common/templates/steps/pre-build-step.yml index f6506183b3..cfcd9a46f8 100644 --- a/eng/pipelines/common/templates/steps/pre-build-step.yml +++ b/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 diff --git a/eng/pipelines/dotnet-sqlclient-ci-core.yml b/eng/pipelines/dotnet-sqlclient-ci-core.yml index 8a32af9d06..77ee594aaf 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-core.yml +++ b/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 }} diff --git a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml index d5cda056b4..6c2f4ea169 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml @@ -124,13 +124,29 @@ 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, and until we update our 1ES images to include + # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10. + # - 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, and until we update our 1ES images to include + # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10. + # + - name: targetFrameworksUnix + displayName: Target Frameworks on Unix type: object default: [net8.0, net9.0] @@ -162,7 +178,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 diff --git a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml index 00b6dbc4d6..d83e65dcb0 100644 --- a/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml +++ b/eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml @@ -124,13 +124,29 @@ 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, and until we update our 1ES images to include + # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10. + # - 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, and until we update our 1ES images to include + # Visual Studio 2026 (18.0) whose MSBuild SDK supports .NET 10. + # + - name: targetFrameworksUnix + displayName: Target Frameworks on Unix type: object default: [net8.0, net9.0] @@ -162,7 +178,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 diff --git a/eng/pipelines/libraries/ci-build-variables.yml b/eng/pipelines/libraries/ci-build-variables.yml index 122281e083..0d9154da16 100644 --- a/eng/pipelines/libraries/ci-build-variables.yml +++ b/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 diff --git a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml index 0b7d8058b0..bc88cb5f38 100644 --- a/eng/pipelines/sqlclient-pr-package-ref-pipeline.yml +++ b/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 diff --git a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml b/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml index ba3588195a..2fc0cad210 100644 --- a/eng/pipelines/sqlclient-pr-project-ref-pipeline.yml +++ b/eng/pipelines/sqlclient-pr-project-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 diff --git a/eng/pipelines/steps/compound-build-akv-step.yml b/eng/pipelines/steps/compound-build-akv-step.yml index 2b4faef3a4..2dd21d8514 100644 --- a/eng/pipelines/steps/compound-build-akv-step.yml +++ b/eng/pipelines/steps/compound-build-akv-step.yml @@ -30,9 +30,15 @@ steps: secureFile: 'netfxKeypair.snk' - task: UseDotNet@2 - displayName: 'Install .NET 9.x SDK' + displayName: 'Install .NET 10.x SDK' inputs: packageType: 'sdk' + version: '10.x' + + - task: UseDotNet@2 + displayName: 'Install .NET 9.x Runtime' + inputs: + packageType: 'runtime' version: '9.x' - task: UseDotNet@2 diff --git a/src/Directory.Build.props b/src/Directory.Build.props index bd945150ee..16535cf9a7 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -153,7 +153,7 @@ https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version --> - - 13 + + 14 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 f1d7c76751..8bdb0e520a 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 @@ -36,7 +36,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 a1b8110fb8..e6ffc2526b 100644 --- a/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj @@ -42,13 +42,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 32b9e76c98..6332d1d8c4 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -1104,9 +1104,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 bb619340db..1d9c1985bd 100644 --- a/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj @@ -43,10 +43,9 @@ - + - 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 4bfe45ee72..fc00117bd7 100644 --- a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj @@ -54,10 +54,6 @@ True True None - - - MinimumRecommendedRules.ruleset - True True $(DefineConstants);USEOFFSET;CODE_ANALYSIS_BASELINE;FEATURE_LEGACYSURFACEAREA;FEATURE_UTF32;FEATURE_UTF7;TRACE; @@ -1065,8 +1061,8 @@ + - diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj index 75b9377df2..f428f19b20 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj @@ -14,18 +14,21 @@ - - - - + + + + + + + diff --git a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlNormalizer.cs b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlNormalizer.cs index f5573d6be9..01200df1fa 100644 --- a/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlNormalizer.cs +++ b/src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Server/SqlNormalizer.cs @@ -129,9 +129,9 @@ internal override int Size { return _size; } - foreach (FieldInfoEx field in _fieldsToNormalize) + foreach (FieldInfoEx fieldInfo in _fieldsToNormalize) { - _size += field.Normalizer.Size; + _size += fieldInfo.Normalizer.Size; } return _size; } diff --git a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props index 8990633c6d..71335f36ba 100644 --- a/src/Microsoft.Data.SqlClient/tests/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/Directory.Build.props @@ -17,7 +17,7 @@ net462 - net8.0;net9.0 + net8.0;net9.0;net10.0 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 bfa2080260..c59bcd6243 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 @@ -331,9 +331,6 @@ - - - diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj index 24bcaab242..380e3c8a8e 100644 --- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj @@ -2,7 +2,7 @@ Exe PerformanceTests - net8.0;net9.0 + net8.0;net9.0;net10.0 Debug;Release; $(ObjFolder)$(Configuration).$(Platform).$(AssemblyName) $(BinFolder)$(Configuration).$(Platform).$(AssemblyName) diff --git a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props index 66fbacae6c..6ff30d72c8 100644 --- a/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props +++ b/src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props @@ -6,7 +6,7 @@ - net462;net47;net471;net472;net48;net481;net8.0;net9.0 + net462;net47;net471;net472;net48;net481;net8.0;net9.0;net10.0 - diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index 6e19ec087b..9cb42a9ed6 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -37,13 +37,13 @@ - + - + @@ -55,23 +55,19 @@ - - - + - - @@ -83,7 +79,6 @@ -