Skip to content

Commit c9d3dc8

Browse files
ViktorHofermmitche
andauthored
Update to .NET 10 SDK and TFM to net10.0 in arcade (#15221)
Co-authored-by: Matt Mitchell <[email protected]>
1 parent fb642e9 commit c9d3dc8

File tree

10 files changed

+23
-19
lines changed

10 files changed

+23
-19
lines changed

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
1717
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
1818
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
19+
<!-- TODO: Remove when arcade updates to a new Arcade SDK with matching TargetFrameworkDefaults.props. -->
20+
<NetCurrent>net10.0</NetCurrent>
21+
<NetPrevious>net9.0</NetPrevious>
22+
<NetToolCurrent>$(NetCurrent)</NetToolCurrent>
23+
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
1924
</PropertyGroup>
2025

2126
</Project>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"sdk": {
3-
"version": "9.0.100",
3+
"version": "10.0.100-alpha.1.24573.1",
44
"rollForward": "latestFeature"
55
},
66
"tools": {
7-
"dotnet": "9.0.100"
7+
"dotnet": "10.0.100-alpha.1.24573.1"
88
},
99
"msbuild-sdks": {
1010
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",

src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
SNBinaryPath="$(SNBinaryPath)"
101101
MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"
102102
WixToolsPath="$(WixInstallPath)"
103-
TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net9.0\any\Microsoft.Dotnet.Tar.dll"
103+
TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net10.0\any\Microsoft.Dotnet.Tar.dll"
104104
RepackParallelism="$(SignToolRepackParallelism)"
105105
MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)" />
106106
</Target>

src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,27 @@
1111

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

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

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

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

27-
<!-- Lowest supported version of .NET Framework the time of the release of NetCurrent.
28-
E.g. if NetCurrent is net9.0, then NetFrameworkMinimum is net462. -->
26+
<!-- Lowest supported version of .NET Framework the time of the release of NetCurrent. -->
2927
<NetFrameworkMinimum>net462</NetFrameworkMinimum>
3028
</PropertyGroup>
3129

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

3937
<!-- Lowest version of .NET at the time of the release of NetCurrent that is supported by tooling.

src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,10 @@
954954
<DefaultValidateFramework Include="net9.0">
955955
<RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
956956
</DefaultValidateFramework>
957+
<NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
958+
<DefaultValidateFramework Include="net10.0">
959+
<RuntimeIDs>@(NETCoreApp100RIDs)</RuntimeIDs>
960+
</DefaultValidateFramework>
957961

958962
<NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
959963
<DefaultValidateFramework Include="netcore50">

src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/msi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<PackageType>DotnetPlatform</PackageType>
2121
<PackageVersion>__PACKAGE_VERSION__</PackageVersion>
2222
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
23-
<TargetFramework>net9.0</TargetFramework>
23+
<TargetFramework>net10.0</TargetFramework>
2424
</PropertyGroup>
2525

2626
<ItemGroup>

src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
6-
<AspNetCoreRuntimeVersion>9.0.0</AspNetCoreRuntimeVersion>
6+
<AspNetCoreRuntimeVersion>10.0.0-alpha.2.24572.1</AspNetCoreRuntimeVersion>
77
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
88
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
99
<!-- 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 -->

src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33

44
<PropertyGroup>
5-
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework>
5+
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework>
66
<XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>
77

88
<XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion>

src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--
5-
We need to target net8.0 while Arcade SDK 8 is being used.
6-
Xliff tasks were moved from dotnet/xliff-tasks to Arcade in V9, so they are not available in release/8.0 branch.
7-
-->
84
<TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
95
<IsPackable>true</IsPackable>
106
<IsBuildTaskProject>true</IsBuildTaskProject>

tests/UnitTests.proj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,10 @@
116116
<Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
117117

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

0 commit comments

Comments
 (0)