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 12 commits into
base: main
Choose a base branch
from
Open

Adding support for .NET 10 #3686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f9ef389
Changes for .net10 support
priyankatiwari08 Oct 13, 2025
dc62764
Reverting this minor change
priyankatiwari08 Oct 14, 2025
6b3eb2c
Conditional logic for system dlls which are part of BCL in .NET 10
priyankatiwari08 Oct 15, 2025
2f0ba41
updating pipelines
priyankatiwari08 Oct 31, 2025
6430e14
Merge branch 'main' into dev/prtiwar/net10support
priyankatiwari08 Oct 31, 2025
c862760
This package was added to ensure the test framework runs correctly, a…
priyankatiwari08 Oct 31, 2025
4dfe206
adding support for including preview versions for .NET 10 since insta…
priyankatiwari08 Oct 31, 2025
d8ba636
Merge branch 'dev/prtiwar/net10support' of https://github.com/dotnet/…
priyankatiwari08 Oct 31, 2025
08ac1e7
Update src/Microsoft.Data.SqlClient/src/Microsoft.Data.SqlClient.csproj
priyankatiwari08 Oct 31, 2025
6ce6e73
Remove includePreviewVersions from CI build step
priyankatiwari08 Oct 31, 2025
63a8371
Enable preview version for .NET SDK in CI step
priyankatiwari08 Oct 31, 2025
0c82041
Change includePreviewVersions to usePreview in YAML
priyankatiwari08 Oct 31, 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
7 changes: 7 additions & 0 deletions 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 @@ -29,6 +29,13 @@ steps:
secureFile: netfxKeypair.snk
retryCount: 5

- task: UseDotNet@2
displayName: 'Use .NET 10.x sdk'
inputs:
packageType: sdk
version: '10.x'
includePreviewVersions: true

- task: UseDotNet@2
displayName: 'Use .NET 9.x sdk'
Copy link
Contributor

@paulmedynski paulmedynski Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that we're installing the .NET 10 SDK everywhere, we can change all of these .NET 9 installs to 'runtime'. We don't need the .NET 9 SDK for anything. Do this for the UseDotNet@2 tasks and calls to the ensure-dotnet-version.yml template.

inputs:
Expand Down
6 changes: 6 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 @@ -35,6 +35,12 @@ parameters:
- allNoDocs

steps:
- template: ./ensure-dotnet-version.yml@self
parameters:
packageType: 'sdk'
version: '10.0'
usePreview: true

- template: ./ensure-dotnet-version.yml@self
parameters:
packageType: 'sdk'
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 @@ -4,6 +4,12 @@
# See the LICENSE file in the project root for more information. #
#################################################################################
steps:
- template: ./ensure-dotnet-version.yml@self
parameters:
packageType: 'sdk'
version: '10.0'
usePreview: true

- template: ./ensure-dotnet-version.yml@self
parameters:
packageType: 'sdk'
Expand Down
7 changes: 7 additions & 0 deletions 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 @@ -26,6 +26,13 @@ steps:
retryCount: 5
secureFile: 'netfxKeypair.snk'

- task: UseDotNet@2
displayName: 'Install .NET 10.x SDK'
inputs:
packageType: 'sdk'
version: '10.x'
includePreviewVersions: true

- task: UseDotNet@2
displayName: 'Install .NET 9.x SDK'
inputs:
Expand Down
8 changes: 4 additions & 4 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
</ItemGroup>

<!-- Published - Target Framework Specific Dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.0'">
Copy link
Contributor

@paulmedynski paulmedynski Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could use $([MSBuild]::VersionGreaterThanOrEquals(...)) here and below.

Copy link
Author

@priyankatiwari08 priyankatiwari08 Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I made this change and tried building the driver code but it resulted in below error:

error MSB4184: The express
ion "[MSBuild]::VersionGreaterThanOrEquals('', net9.0)" cannot be evaluated. Version string was not in a correct format.

On checking further could understand that since we have multi-targetting with TargetFrameworks, MSBuild sets $(TargetFramework) for each target during the build, but during initial evaluation or restore, it may be unset leading to $TargetFramework being empty which caused above error.

Hence, I believe its rather safe to use below:

• It directly checks for the exact target frameworks you want (net9.0 or net10.0).
• It avoids MSBuild errors if $(TargetFramework) is empty or not a valid version string.
• It is more readable and less error-prone than using VersionGreaterThanOrEquals, which can fail if the property is not set.

Copy link
Contributor

@paulmedynski paulmedynski Oct 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have a look at the docs for VersionGreaterThanOrEquals here:

https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=vs-2022#msbuild-version-comparison-functions

You could also try using IsTargetFrameworkCompatible:

https://learn.microsoft.com/en-us/visualstudio/msbuild/property-functions?view=vs-2022#msbuild-targetframework-and-targetplatform-functions

$([MSBuild]::IsTargetFrameworkCompatible($(TargetFramework), 'net9.0'))

That should be false when $(TargetFramework) is net8.0, and true for net9.0 and net10.0.

I think that is actually better than using VersionGreaterThanOrEquals.

<!-- MDS and AKV -->
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0'">
<ItemGroup Condition="'$(TargetFramework)' != 'net9.0' and '$(TargetFramework)' != 'net10.0'">
<!-- MDS and AKV -->
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
</ItemGroup>
Expand Down Expand Up @@ -72,13 +72,13 @@
</ItemGroup>

<!-- Common Target Framework Specific Dependencies -->
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0' or '$(TargetFramework)' == 'net10.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="'$(TargetFramework)' != 'net9.0' and '$(TargetFramework)' != 'net10.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
8 changes: 6 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 @@ -40,8 +40,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Azure.Core" />
<PackageReference Include="System.Text.Encodings.Web" />
<!--<PackageReference Include="System.Text.Encodings.Web" />-->
<PackageReference Include="Azure.Security.KeyVault.Keys" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
</ItemGroup>
</Project>
<ItemGroup Condition="$([MSBuild]::VersionLessThan('$(NETCoreSdkVersion)', '10.0.100'))">
<PackageReference Include="System.Text.Encodings.Web" />
</ItemGroup>

</Project>
6 changes: 5 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,12 @@
<PackageReference Include="Microsoft.SqlServer.Server" />
<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Security.Cryptography.Pkcs" />

<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
<!--<PackageReference Include="System.Text.Json" />-->
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::VersionLessThan('$(NETCoreSdkVersion)', '10.0.100'))">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand Down
4 changes: 4 additions & 0 deletions 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 @@ -1086,6 +1086,10 @@
<PackageReference Include="System.Security.Cryptography.Pkcs" />

<!-- Transitive dependencies that would otherwise bring in older, vulnerable versions. -->
<!--<PackageReference Include="System.Text.Json" />-->
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::VersionLessThan('$(NETCoreSdkVersion)', '10.0.100'))">
<PackageReference Include="System.Text.Json" />
</ItemGroup>

Expand Down
13 changes: 9 additions & 4 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,10 @@
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<PackageReference Include="System.Buffers" />
<!--<PackageReference Include="System.Buffers" />-->
Copy link
Contributor

@paulmedynski paulmedynski Oct 31, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tidy up these commented-out lines.

<PackageReference Include="System.Configuration.ConfigurationManager" />
<PackageReference Include="System.Memory" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
<!--<PackageReference Include="System.Memory" />-->
<!--<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />-->
<PackageReference Include="System.Security.Cryptography.Pkcs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
Expand All @@ -26,6 +26,11 @@
<Reference Include="System.Transactions" />
<PackageReference Include="System.Data.Common" />
<PackageReference Include="System.ValueTuple" />
<PackageReference Include="System.Threading.Channels" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::VersionLessThan('$(NETCoreSdkVersion)', '10.0.100'))">
<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>
Copy link
Contributor

@paulmedynski paulmedynski Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, making this change will require that we start using the .NET 10 SDK to build the tests everywhere (locally as devs and during all pipelines).

For devs, that's fine - we just need to install the .NET 10 SDK wherever we're developing. We will need to update the BUILDGUIDE.md to reflect this new requiremet.

For pipelines, we will need to find everywhere that we perform a build of the tests and add a step that installs the .NET 10 SDK. If you do this, then you can use the existing CI pipelines to verify .NET 10 compatibility rather than trying to get the tests to run for you locally (which is close to impossible currently).

<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>net9.0;net10.0</TargetFrameworks>
Copy link
Contributor

@paulmedynski paulmedynski Oct 31, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can remove net9.0 here. This project builds a tool that we use during the build, so it only needs to target one runtime.

</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