[main] Update dependencies from dotnet/arcade (#46021)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Javier Calvarro Nelson <[email protected]> Co-authored-by: Jason Zhai <[email protected]>
dotnet · Jan 24, 2025 · e2b601d · e2b601d
1 parent 8e7eb68
commit e2b601d
Show file tree

Hide file tree

Showing 38 changed files with 19,139 additions and 942 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -604,34 +604,34 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25072.2">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25073.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2ac4034732f0dbb9781beae751cf15b65aff1bcd</Sha>
+      <Sha>ba09eddf11e81ff604c3118eddb86517cfcd4969</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.25072.13">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -267,10 +267,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25072.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
-    <MicrosoftDotNetSignToolVersion>10.0.0-beta.25072.2</MicrosoftDotNetSignToolVersion>
-    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25072.2</MicrosoftDotNetXliffTasksVersion>
-    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25072.2</MicrosoftDotNetXUnitExtensionsVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25073.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetSignToolVersion>10.0.0-beta.25073.5</MicrosoftDotNetSignToolVersion>
+    <MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25073.5</MicrosoftDotNetXliffTasksVersion>
+    <MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25073.5</MicrosoftDotNetXUnitExtensionsVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sourcelink -->

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "10.0.100-alpha.1.24573.1",
+    "dotnet": "10.0.100-alpha.1.25073.3",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25072.2",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25072.2",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25073.5",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25073.5",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }

diff --git a/src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch b/src/SourceBuild/patches/arcade/0001-set-rid-for-project-for-live-runtime.patch
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs
@@ -111,7 +111,7 @@ public class ProcessFrameworkReferences : TaskBase
 
         public bool UsingMicrosoftNETSdkWebAssembly { get; set; }
 
-        public bool UsingMicrosoftNETSdkRazor { get; set; }
+        public bool RequiresAspNetWebAssets { get; set; }
 
         [Required]
         public string NETCoreSdkRuntimeIdentifier { get; set; }
@@ -502,7 +502,7 @@ protected override void ExecuteCore()
                 AddToolPack(ToolPackType.WebAssemblySdk, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences);
             }
 
-            if (UsingMicrosoftNETSdkRazor && _normalizedTargetFrameworkVersion.Major >= 10)
+            if (RequiresAspNetWebAssets && _normalizedTargetFrameworkVersion.Major >= 10)
             {
                 if (AddToolPack(ToolPackType.AspNetCore, _normalizedTargetFrameworkVersion, packagesToDownload, implicitPackageReferences) is not ToolPackSupport.Supported)
                 {

diff --git a/.../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets b/.../Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Sdk.FrameworkReferenceResolution.targets
@@ -81,6 +81,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <PropertyGroup>
       <EnableTargetingPackDownload Condition="'$(EnableTargetingPackDownload)' == ''">true</EnableTargetingPackDownload>
       <EnableRuntimePackDownload Condition="'$(EnableRuntimePackDownload)' == ''">true</EnableRuntimePackDownload>
+      <RequiresAspNetWebAssets Condition="'$(RequiresAspNetWebAssets)' == ''">false</RequiresAspNetWebAssets>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -136,7 +137,7 @@ Copyright (c) .NET Foundation. All rights reserved.
                                 KnownWebAssemblySdkPacks="@(KnownWebAssemblySdkPack)"
                                 KnownAspNetCorePacks="@(KnownAspNetCorePack)"
                                 UsingMicrosoftNETSdkWebAssembly="$(UsingMicrosoftNETSdkWebAssembly)"
-                                UsingMicrosoftNETSdkRazor="$(UsingMicrosoftNETSdkRazor)"
+                                RequiresAspNetWebAssets="$(RequiresAspNetWebAssets)"
                                 NETCoreSdkRuntimeIdentifier="$(NETCoreSdkRuntimeIdentifier)"
                                 NETCoreSdkPortableRuntimeIdentifier="$(NETCoreSdkPortableRuntimeIdentifier)"
                                 NetCoreRoot="$(NetCoreRoot)"

diff --git a/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets b/src/WebSdk/ProjectSystem/Targets/Microsoft.NET.Sdk.Web.ProjectSystem.targets
@@ -108,4 +108,9 @@ Copyright (c) .NET Foundation. All rights reserved.
     </When>
   </Choose>
 
+  <Target Name="ResolveRequiredWebAssets" BeforeTargets="ProcessFrameworkReferences">
+    <PropertyGroup>
+      <RequiresAspNetWebAssets Condition="'$(RequiresAspNetWebAssets)' == '' and @(Content->AnyHaveMetadataValue(Extension, .razor))">true</RequiresAspNetWebAssets>
+    </PropertyGroup>
+  </Target>
 </Project>
diff --git a/test/EndToEnd.Tests/ProjectBuildTests.cs b/test/EndToEnd.Tests/ProjectBuildTests.cs
@@ -410,8 +410,7 @@ private static string DetectExpectedDefaultFramework(string template = "")
             if (latestMajorVersion == 10)
             {
                 // TODO: This block need to be updated when every template updates their default tfm.
-                // Currently winforms updated their default templates target but not others.
-                if (template.StartsWith("winforms") || template.StartsWith("wpf"))
+                if (template.StartsWith("wpf"))
                 {
                     return $"net9.0";
                 }