Skip to content
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.

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

Update to .NET 10 SDK and TFM to net10.0 in arcade #15221

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
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
5 changes: 5 additions & 0 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
<!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. -->
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
<NetCurrent>net10.0</NetCurrent>
<NetPrevious>net9.0</NetPrevious>
<NetToolCurrent>$(NetCurrent)</NetToolCurrent>
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
</PropertyGroup>

</Project>
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.100-alpha.1.24551.9",
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
"rollForward": "latestFeature"
},
"tools": {
"dotnet": "9.0.100"
"dotnet": "10.0.100-alpha.1.24551.9"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,27 @@

<PropertyGroup>
<!-- The TFM of the major release of .NET that the Arcade SDK aligns with. -->
<NetCurrent>net9.0</NetCurrent>
<NetCurrent>net10.0</NetCurrent>

<!-- The previously released version of .NET.
Undefined when NetMinimum and NetPrevious are identical. -->
<NetPrevious />
<NetPrevious>net9.0</NetPrevious>

<!-- Lowest supported version of .NET at the time of the release of NetCurrent.
E.g. net8.0 when NetCurrent is net9.0. -->
<!-- Lowest supported version of .NET at the time of the release of NetCurrent. -->
<NetMinimum>net8.0</NetMinimum>

<!-- The TFM of the latest version of .NET Framework. -->
<NetFrameworkCurrent>net481</NetFrameworkCurrent>

<!-- Lowest supported version of .NET Framework the time of the release of NetCurrent.
E.g. if NetCurrent is net9.0, then NetFrameworkMinimum is net462. -->
<!-- Lowest supported version of .NET Framework the time of the release of NetCurrent. -->
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
</PropertyGroup>

<PropertyGroup>
<!-- The current version of .NET that tools (i.e. msbuild) target.
MSBuild tasks and tools should use this version to target the latest TFM that is supported by tooling.
Identical with NetCurrent when building from source. -->
<NetToolCurrent Condition="'$(DotNetBuildSourceOnly)' != 'true'">net9.0</NetToolCurrent>
<NetToolCurrent Condition="'$(DotNetBuildSourceOnly)' != 'true'">net10.0</NetToolCurrent>
<NetToolCurrent Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolCurrent>

<!-- Lowest version of .NET at the time of the release of NetCurrent that is supported by tooling.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -954,6 +954,10 @@
<DefaultValidateFramework Include="net9.0">
<RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
</DefaultValidateFramework>
<NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
<DefaultValidateFramework Include="net10.0">
<RuntimeIDs>@(NETCoreApp100RIDs)</RuntimeIDs>
</DefaultValidateFramework>

<NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
<DefaultValidateFramework Include="netcore50">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<PackageType>DotnetPlatform</PackageType>
<PackageVersion>__PACKAGE_VERSION__</PackageVersion>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>$(NetToolCurrent)</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
<AspNetCoreRuntimeVersion>9.0.0</AspNetCoreRuntimeVersion>
<AspNetCoreRuntimeVersion>10.0.0-alpha.2.24531.4</AspNetCoreRuntimeVersion>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
<!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project>

<PropertyGroup>
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework>
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework>
<XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>

<XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<!--
We need to target net8.0 while Arcade SDK 8 is being used.
Xliff tasks were moved from dotnet/xliff-tasks to Arcade in V9, so they are not available in release/8.0 branch.
-->
<TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
<IsPackable>true</IsPackable>
<IsBuildTaskProject>true</IsBuildTaskProject>
Expand Down
5 changes: 3 additions & 2 deletions tests/UnitTests.proj
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,10 @@
<Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>

<ItemGroup>
<HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">
<!-- TODO: Re-enable aspnetcore version branding test: https://github.com/dotnet/arcade/issues/15249 -->
<!-- <HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">
<Command>powershell %HELIX_WORKITEM_PAYLOAD%\aspnet-versioncheck.ps1 -aspNetCoreVersion $(AspNetCoreRuntimeVersion)</Command>
<PayloadDirectory>$(MSBuildThisFileDirectory)\AspNetVersionCheck</PayloadDirectory>
</HelixWorkItem>
</HelixWorkItem> -->
</ItemGroup>
</Project>