Skip to content

Adding support for .NET 10 #3686

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 25 commits into
base: main
Choose a base branch
from
+164 −88
Open

Adding support for .NET 10 #3686

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a54dc67
- Changes for .net10 support
priyankatiwari08 Oct 13, 2025
f2411bf
Remove includePreviewVersions for .NET 10.x SDK
priyankatiwari08 Nov 28, 2025
0430b05
Remove includePreviewVersions for .NET 10.x SDK
priyankatiwari08 Nov 28, 2025
0e02281
Change .NET 9.x task from sdk to runtime
priyankatiwari08 Dec 1, 2025
46f2712
Update ci-project-build-step.yml
priyankatiwari08 Dec 1, 2025
e0e9539
Update pre-build-step.yml
priyankatiwari08 Dec 1, 2025
2ee557b
Update compound-build-akv-step.yml
priyankatiwari08 Dec 1, 2025
9b8e57d
re-doing some comments related fix.
priyankatiwari08 Dec 1, 2025
4f45b27
Format Directory.Packages.props for readability
priyankatiwari08 Dec 2, 2025
7259730
adding comments for packages which are included in .NET 10 BCL
priyankatiwari08 Dec 2, 2025
3922eed
Merge branch 'dev/prtiwar/net10support' of https://github.com/dotnet/…
priyankatiwari08 Dec 2, 2025
345e6ac
Change default target framework from net10.0 to net9.0
priyankatiwari08 Dec 2, 2025
04281b3
Update target frameworks in CI pipeline
priyankatiwari08 Dec 2, 2025
7a7d947
Remove net10.0 from target frameworks
priyankatiwari08 Dec 2, 2025
3b2cf94
Remove net10.0 from target frameworks
priyankatiwari08 Dec 2, 2025
90cbdc7
changes per PR comment
priyankatiwari08 Dec 2, 2025
bbb7612
Merge branch 'dev/prtiwar/net10support' of https://github.com/dotnet/…
priyankatiwari08 Dec 2, 2025
7bb6e09
Downgrade C# language version from 14 to 13
priyankatiwari08 Dec 2, 2025
148e9f0
- Updated LangVersion to 14 and fixed one place using the new 'field'…
paulmedynski Dec 2, 2025
29049f1
- Added .NET 10 as a target framework/runtime to build and run tests.
paulmedynski Dec 2, 2025
2b6e260
- Fixed target frameworks for Unix parameters.
paulmedynski Dec 2, 2025
38332f3
- Fixed target frameworks for Unix parameters.
paulmedynski Dec 2, 2025
31ba79c
- Removed .NET 10 from PR pipeline test runs; it remains for CI pipel…
paulmedynski Dec 3, 2025
0575bf2
- Removed unnecessary System.Text.Web.Encodings package from AKV.
paulmedynski Dec 3, 2025
dec7e69
- Added back a few packages specifically for .NET Framework and Stand…
paulmedynski Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -42,11 +42,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
Expand All @@ -65,13 +65,13 @@
<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" />
Expand Down Expand Up @@ -101,4 +101,4 @@
<!-- =================================================================== -->
<!-- MSS Dependencies -->
<!-- None -->
</Project>
</Project>
5 changes: 5 additions & 0 deletions eng/pipelines/common/templates/jobs/ci-code-coverage-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
8 changes: 7 additions & 1 deletion eng/pipelines/common/templates/steps/build-all-configurations-signed-dlls-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/common/templates/steps/ci-prebuild-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/common/templates/steps/ci-project-build-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions eng/pipelines/common/templates/steps/pre-build-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/dotnet-sqlclient-ci-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parameters:
- name: netcoreVersionTestUtils
displayName: 'Netcore Version for Test Utilities'
type: object
default: net9.0
default: net10.0

- name: buildPlatforms
displayName: 'Build Platforms on Windows'
Expand Down
2 changes: 0 additions & 2 deletions eng/pipelines/libraries/ci-build-variables.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ variables:

- name: buildNumber
value: '$(Build.BuildNumber)'
- name: TFNetCore
value: 'net8.0'
- name: SQLTarget
value: 'localhost'
- name: NugetPackageVersion
Expand Down
8 changes: 7 additions & 1 deletion eng/pipelines/steps/compound-build-akv-step.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 7 additions & 2 deletions ...ureKeyVaultProvider/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,13 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Core" />
<PackageReference Include="System.Text.Encodings.Web" />
<PackageReference Include="Azure.Security.KeyVault.Keys" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
</ItemGroup>
</Project>

<!-- System.Text.Encodings.Web is included in .NET 10+ BCL-->
<ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

</Project>
5 changes: 4 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,11 @@
<PackageReference Include="Microsoft.SqlServer.Server" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Security.Cryptography.Pkcs" />

</ItemGroup>

<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
<!-- System.Text.Json is included in .NET 10+ BCL -->
<ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand Down
4 changes: 3 additions & 1 deletion src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1104,8 +1104,10 @@
<PackageReference Include="Microsoft.SqlServer.Server" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Security.Cryptography.Pkcs" />
</ItemGroup>

<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
<!-- System.Text.Json is included in .NET 10+ BCL -->
<ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand Down
10 changes: 7 additions & 3 deletions src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,7 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
<PackageReference Include="System.Security.Cryptography.Pkcs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
Expand All @@ -27,5 +24,12 @@
<PackageReference Include="System.Data.Common" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="System.Threading.Channels" />
</ItemGroup>

<!-- System.Buffers, System.Memory, and System.Runtime.InteropServices.RuntimeInformation are included in .NET 10+ BCL -->
<ItemGroup Condition="$([MSBuild]::VersionLessThan($([MSBuild]::GetTargetFrameworkVersion($(TargetFramework))), '10.0'))">
<PackageReference Include="System.Buffers" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
<PropertyGroup>
<TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0</TargetNetCoreVersion>
<TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">net8.0;net9.0;net10.0</TargetNetCoreVersion>
</PropertyGroup>

<Choose>
Expand Down
2 changes: 1 addition & 1 deletion ...ft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>PerformanceTests</AssemblyName>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Configurations>Debug;Release;</Configurations>
<IntermediateOutputPath>$(ObjFolder)$(Configuration).$(Platform).$(AssemblyName)</IntermediateOutputPath>
<OutputPath>$(BinFolder)$(Configuration).$(Platform).$(AssemblyName)</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/StressTests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<!-- Properties common to all projects in this solution. -->
<PropertyGroup>
<!-- Target all frameworks that MDS supports. -->
<TargetFrameworks>net462;net47;net471;net472;net48;net481;net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net462;net47;net471;net472;net48;net481;net8.0;net9.0;net10.0</TargetFrameworks>

<!--
Use the latest C# language version, regardless of what a particular
Expand Down
3 changes: 1 addition & 2 deletions .../tools/Microsoft.Data.SqlClient.ExtUtilities/Microsoft.Data.SqlClient.ExtUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<StartupObject>Microsoft.Data.SqlClient.ExtUtilities.Runner</StartupObject>
<TargetFrameworks>net9.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.SqlServer.SqlManagementObjects" />
Expand All @@ -11,7 +11,6 @@
Transitive dependencies with vulnerabilities, so we explicitly ask for
non-vulnerable versions.
-->
<PackageReference Include="System.Formats.Asn1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
Expand Down
Loading