diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88b68d82d086..82952d993c47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,11 +254,9 @@ https://github.com/dotnet/runtime 9c1f53e39f48b09be71097f1b7a47e45331e4906 - - + https://github.com/dotnet/runtime - c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1 + 5b56f15ef5ac5ded75b342d31759d22d2202764d https://github.com/dotnet/windowsdesktop @@ -585,15 +583,13 @@ https://github.com/dotnet/runtime 9c1f53e39f48b09be71097f1b7a47e45331e4906 - + https://github.com/dotnet/runtime - c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1 + 5b56f15ef5ac5ded75b342d31759d22d2202764d - - + https://github.com/dotnet/runtime - c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1 + 5b56f15ef5ac5ded75b342d31759d22d2202764d @@ -627,11 +623,9 @@ 78eb939933628c20c88ddd88536a70f02ecc2945 - - + https://github.com/dotnet/runtime - c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1 + 5b56f15ef5ac5ded75b342d31759d22d2202764d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d04665b65cb9..3bb3771e7568 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -134,15 +134,15 @@ 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 - 9.0.0-rc.2.24473.5 - 9.0.0-rc.2.24473.5 + 10.0.0-alpha.1.24557.1 + 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 - 9.0.0-rc.2.24473.5 + 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 - 9.0.0-rc.2.24473.5 + 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 10.0.0-alpha.1.24557.1 + net10.0 false diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index 13f735a5cdaa..ea94169d60f6 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - 1ccd352f12e845d89e5b5a9b800e2be88f8a6d98 + 1818ed2babf890a1cd62fa96a1f03abdada2d003 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 3c1ecf771c32..f7b5f06253da 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,9 +23,9 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.100-rc.2.24474.1 - 9.0.100-rc.2.24474.1 - 0.1.0-10.0.100-4 + 10.0.100-alpha.1.24556.1 + 10.0.100-alpha.1.24556.1 + 0.1.0-10.0.100-5 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index 4e561f406eb9..0cef1ca7ad9d 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "10.0.100-alpha.1.24551.9" + "dotnet": "10.0.100-alpha.1.24555.54" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1" } } diff --git a/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch b/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch new file mode 100644 index 000000000000..529f92302c4c --- /dev/null +++ b/src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch @@ -0,0 +1,90 @@ +From b6100609c16295746b0c875494d5d66dabe35560 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Wed, 6 Nov 2024 16:43:26 +0000 +Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade + +Backport: https://github.com/dotnet/arcade/pull/15221 +--- + Directory.Build.props | 5 +++++ + global.json | 4 ++-- + .../src/build/Packaging.targets | 4 ++++ + .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- + .../Microsoft.DotNet.XliffTasks.csproj | 4 ---- + 5 files changed, 12 insertions(+), 7 deletions(-) + +diff --git a/Directory.Build.props b/Directory.Build.props +index 9d84f1dc6..b25de0091 100644 +--- a/Directory.Build.props ++++ b/Directory.Build.props +@@ -16,6 +16,11 @@ + https://github.com/dotnet/arcade + + $(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904 ++ ++ net10.0 ++ net9.0 ++ $(NetCurrent) ++ $(NetToolCurrent) + + + +diff --git a/global.json b/global.json +index 3a7409606..3054e30d7 100644 +--- a/global.json ++++ b/global.json +@@ -1,10 +1,10 @@ + { + "sdk": { +- "version": "9.0.100-rc.2.24474.11", ++ "version": "10.0.100-alpha.1.24551.9", + "rollForward": "latestFeature" + }, + "tools": { +- "dotnet": "9.0.100-rc.2.24474.11" ++ "dotnet": "10.0.100-alpha.1.24551.9" + }, + "msbuild-sdks": { + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1", +diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +index b94b6736d..e0fadabb2 100644 +--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets ++++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets +@@ -954,6 +954,10 @@ + + @(NETCoreApp90RIDs) + ++ ++ ++ @(NETCoreApp100RIDs) ++ + + + +diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +index 0ae8d1482..9312e2672 100644 +--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets ++++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +@@ -2,7 +2,7 @@ + + + +- net9.0 ++ net10.0 + netcoreapp2.0 + + 2.9.2 +diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj +index 1059c3bc4..165a4a7d5 100644 +--- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj ++++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj +@@ -1,10 +1,6 @@ + + + +- + $(NetToolMinimum);$(NetFrameworkToolCurrent) + true + true diff --git a/src/SourceBuild/patches/aspnetcore/0001-Target net10.0 TFM in RepoTasks.patch b/src/SourceBuild/patches/aspnetcore/0001-Target net10.0 TFM in RepoTasks.patch new file mode 100644 index 000000000000..6b1f1ef71e4f --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-Target net10.0 TFM in RepoTasks.patch @@ -0,0 +1,44 @@ +From 0612070b83354c70993ca1aa7eabd2babdf8a5c5 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 6 Nov 2024 16:08:49 -0600 +Subject: [PATCH] Target net10.0 TFM in RepoTasks + +Backport: https://github.com/dotnet/aspnetcore/issues/58823 +--- + eng/tools/RepoTasks/RepoTasks.csproj | 4 ++-- + eng/tools/RepoTasks/RepoTasks.tasks | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj +index 24f833af9b..c462a7517a 100644 +--- a/eng/tools/RepoTasks/RepoTasks.csproj ++++ b/eng/tools/RepoTasks/RepoTasks.csproj +@@ -1,6 +1,6 @@ + + +- net9.0 ++ $(DefaultNetCoreTargetFramework) + $(TargetFrameworks);net472 + $(DefineConstants);BUILD_MSI_TASKS + false +@@ -31,7 +31,7 @@ + + + +- ++ + + + +diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks +index 0ad5b3ae45..b6cd9a820d 100644 +--- a/eng/tools/RepoTasks/RepoTasks.tasks ++++ b/eng/tools/RepoTasks/RepoTasks.tasks +@@ -1,6 +1,6 @@ + + +- <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net9.0 ++ <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework) + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 + <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll + diff --git a/src/SourceBuild/patches/nuget-client/0001-Use net10.0 TMF for source build.patch b/src/SourceBuild/patches/nuget-client/0001-Use net10.0 TMF for source build.patch new file mode 100644 index 000000000000..a4a85408bae0 --- /dev/null +++ b/src/SourceBuild/patches/nuget-client/0001-Use net10.0 TMF for source build.patch @@ -0,0 +1,26 @@ +From 64331771541cc9c911a5fb1e95eb6983a5b13b94 Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Wed, 6 Nov 2024 15:29:15 -0600 +Subject: [PATCH] Use net10.0 TMF for source build + +Backport: https://github.com/NuGet/Home/issues/13914 +--- + build/common.project.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/build/common.project.props b/build/common.project.props +index f65578999..7c1f04aa9 100644 +--- a/build/common.project.props ++++ b/build/common.project.props +@@ -12,9 +12,9 @@ + net472 + netstandard2.0 + net8.0 +- net9.0 ++ net10.0 + netcoreapp3.1 +- net9.0 ++ net10.0 + netcoreapp5.0 + + diff --git a/src/SourceBuild/patches/runtime/0001-Runtime patch to support net10.0.patch b/src/SourceBuild/patches/runtime/0001-Runtime patch to support net10.0.patch new file mode 100644 index 000000000000..d69cf2541868 --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-Runtime patch to support net10.0.patch @@ -0,0 +1,23 @@ +From 9ec08acee2d24f45be29469635db8494c5d4046c Mon Sep 17 00:00:00 2001 +From: Matt Thalman +Date: Thu, 7 Nov 2024 09:00:10 -0600 +Subject: [PATCH] Runtime patch to support net10.0 + +Backport: https://github.com/dotnet/runtime/pull/109619 +--- + .../src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props +index f624c914ea8..7db89422f2c 100644 +--- a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props ++++ b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props +@@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved. + + true +- $(MSBuildThisFileDirectory)..\tools\net9.0\ILLink.Tasks.dll ++ $(MSBuildThisFileDirectory)..\tools\net10.0\ILLink.Tasks.dll + $(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll + + $(MSBuildThisFileDirectory)Microsoft.NET.ILLink.Analyzers.props