Update arcade patch to reflect merged PR content

dotnet · mthalman · Dec 12, 2024 · Dec 17, 2024 · Dec 18, 2024 · Dec 18, 2024
commit f0cda56ea41e751d8489a4eb3d91c2ad3f89f398
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
@@ -1,54 +1,113 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From a0d0705b27c50a0975ff825215723243d5a813c3 Mon Sep 17 00:00:00 2001
 From: Viktor Hofer <viktor.hofer@microsoft.com>
 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/dotnet-cli/DotNetCli.props                     | 2 +-
- .../Sdk/tools/xunit-runner/XUnitRunner.targets               | 2 +-
- .../Microsoft.DotNet.XliffTasks.csproj                       | 4 ----
- tests/UnitTests.proj                                         | 5 +++--
- 7 files changed, 16 insertions(+), 10 deletions(-)
+ Directory.Build.props                                |  5 +++++
+ global.json                                          |  4 ++--
+ src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj      |  2 +-
+ .../tools/TargetFrameworkDefaults.props              | 12 +++++-------
+ .../src/build/Packaging.targets                      |  4 ++++
+ .../src/Misc/msi.csproj                              |  2 +-
+ .../Sdk/tools/dotnet-cli/DotNetCli.props             |  2 +-
+ .../Sdk/tools/xunit-runner/XUnitRunner.targets       |  2 +-
+ .../Microsoft.DotNet.XliffTasks.csproj               |  4 ----
+ tests/UnitTests.proj                                 |  5 +++--
+ 10 files changed, 23 insertions(+), 19 deletions(-)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 9d84f1dc6..b25de0091 100644
+index 9d84f1dc6..b4e468bdf 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
-@@ -17,4 +17,9 @@
+@@ -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. -->
++    <!-- TODO: Remove when arcade updates to a new Arcade SDK with matching TargetFrameworkDefaults.props. -->
 +    <NetCurrent>net10.0</NetCurrent>
 +    <NetPrevious>net9.0</NetPrevious>
 +    <NetToolCurrent>$(NetCurrent)</NetToolCurrent>
 +    <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
    </PropertyGroup>
 
+ </Project>
 diff --git a/global.json b/global.json
-index af88ae5bf..904f8d03d 100644
+index af88ae5bf..be8040610 100644
 --- a/global.json
 +++ b/global.json
-@@ -1,9 +1,9 @@
+@@ -1,10 +1,10 @@
  {
    "sdk": {
 -    "version": "9.0.100",
-+    "version": "10.0.100-alpha.1.24551.9",
++    "version": "10.0.100-alpha.1.24573.1",
      "rollForward": "latestFeature"
    },
    "tools": {
 -    "dotnet": "9.0.100"
-+    "dotnet": "10.0.100-alpha.1.24551.9"
++    "dotnet": "10.0.100-alpha.1.24573.1"
    },
    "msbuild-sdks": {
+     "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
+diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+index 913496c50..75ef481b2 100644
+--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+@@ -100,7 +100,7 @@
+         SNBinaryPath="$(SNBinaryPath)"
+         MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)"
+         WixToolsPath="$(WixInstallPath)"
+-        TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net9.0\any\Microsoft.Dotnet.Tar.dll"
++        TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net10.0\any\Microsoft.Dotnet.Tar.dll"
+         RepackParallelism="$(SignToolRepackParallelism)"
+         MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)" />
+   </Target>
+diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
+index bd83cda60..33c2fea4e 100644
+--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
++++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props
+@@ -11,21 +11,19 @@
+
+   <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>
+
+@@ -33,7 +31,7 @@
+     <!-- 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.
 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
-@@ -955,4 +955,8 @@
+@@ -954,6 +954,10 @@
+     <DefaultValidateFramework Include="net9.0">
        <RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
      </DefaultValidateFramework>
 +    <NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
@@ -57,33 +116,52 @@ index b94b6736d..e0fadabb2 100644
 +    </DefaultValidateFramework>
 
      <NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
+     <DefaultValidateFramework Include="netcore50">
+diff --git a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/msi.csproj b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/msi.csproj
+index b2062af0a..ded5cf7b0 100644
+--- a/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/msi.csproj
++++ b/src/Microsoft.DotNet.Build.Tasks.Workloads/src/Misc/msi.csproj
+@@ -20,7 +20,7 @@
+     <PackageType>DotnetPlatform</PackageType>
+     <PackageVersion>__PACKAGE_VERSION__</PackageVersion>
+     <SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
+-    <TargetFramework>net9.0</TargetFramework>
++    <TargetFramework>net10.0</TargetFramework>
+   </PropertyGroup>
+
+   <ItemGroup>
 diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
-index 63552b1ed..15d5a63aa 100644
+index 63552b1ed..2d8a28a73 100644
 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
 +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
-@@ -4,5 +4,5 @@
+@@ -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>
++    <AspNetCoreRuntimeVersion>10.0.0-alpha.2.24572.1</AspNetCoreRuntimeVersion>
      <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 -->
 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
-@@ -3,5 +3,5 @@
+@@ -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>
 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
-@@ -2,8 +2,4 @@
+@@ -1,10 +1,6 @@
+ <Project Sdk="Microsoft.NET.Sdk">
 
    <PropertyGroup>
 -    <!--
@@ -92,11 +170,13 @@ index 1059c3bc4..165a4a7d5 100644
 -    -->
      <TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
      <IsPackable>true</IsPackable>
+     <IsBuildTaskProject>true</IsBuildTaskProject>
 diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
 index 910ccf3b0..ad85e4bac 100644
 --- a/tests/UnitTests.proj
 +++ b/tests/UnitTests.proj
-@@ -117,8 +117,9 @@
+@@ -116,9 +116,10 @@
+   <Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
 
    <ItemGroup>
 -    <HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">