Merge remote-tracking branch 'upstream/main' into BlazorHotReloadPackage

Author: maraf

.azure/pipelines/ci.yml

@@ -669,14 +669,13 @@ extends:
                 path: artifacts/log/
                 publishOnError: true
                 includeForks: true
-
       # Source build
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
           enableInternalSources: true
           platform:
             name: 'Managed'
-            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9'
+            container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64'
             buildScript: './eng/build.sh'
             buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
             jobProperties:

eng/Common.props

@@ -47,5 +47,6 @@
     <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
                                                 or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
                                                     and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
+    <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
   </PropertyGroup>
 </Project>

eng/targets/Helix.Common.props

@@ -1,12 +1,13 @@
 <Project>
   <!-- This file is shared between Helix.proj and .csproj files. -->
   <PropertyGroup>
-    <HelixQueueAlmaLinux8>(AlmaLinux.8.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64</HelixQueueAlmaLinux8>
-    <HelixQueueAlpine318>(Alpine.318.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.18-helix-amd64</HelixQueueAlpine318>
-    <HelixQueueDebian12>(Debian.12.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-amd64</HelixQueueDebian12>
-    <HelixQueueFedora41>(Fedora.41.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-41-helix</HelixQueueFedora41>
-    <HelixQueueMariner>(Mariner)[email protected]/dotnet-buildtools/prereqs:cbl-mariner-2.0-helix-amd64</HelixQueueMariner>
-    <HelixQueueArmDebian12>(Debian.12.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-12-helix-arm64v8</HelixQueueArmDebian12>
+    <HelixQueueAlmaLinux>(AlmaLinux.9.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64</HelixQueueAlmaLinux>
+    <HelixQueueAlpine>(Alpine.321.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:alpine-3.21-helix-amd64</HelixQueueAlpine>
+    <HelixQueueAzureLinux>(AzureLinux.30.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:azurelinux-3.0-helix-amd64</HelixQueueAzureLinux>
+    <HelixQueueDebian>(Debian.13.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-amd64</HelixQueueDebian>
+    <HelixQueueFedora>(Fedora.42.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:fedora-42-helix-amd64</HelixQueueFedora>
+    <!-- Arm64 -->
+    <HelixQueueArmDebian>(Debian.13.Arm64.Open)[email protected]/dotnet-buildtools/prereqs:debian-13-helix-arm64v8</HelixQueueArmDebian>
 
     <!-- Do not attempt to override global property. -->
     <RunQuarantinedTests Condition=" '$(RunQuarantinedTests)' == '' ">false</RunQuarantinedTests>
@@ -38,14 +39,15 @@
       <!-- aspnetcore-quarantined-tests (quarantined-tests.yml) and RunHelix.ps1 -RunQuarantinedTests -->
       <ItemGroup>
         <!-- Linux -->
-        <HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux8)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAlmaLinux)" Platform="Linux" />
 
         <!-- Containers -->
-        <HelixAvailableTargetQueue Include="$(HelixQueueAlpine318)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueDebian12)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueFedora41)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueMariner)" Platform="Linux" />
-        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian12)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAlpine)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueAzureLinux)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueDebian)" Platform="Linux" />
+        <HelixAvailableTargetQueue Include="$(HelixQueueFedora)" Platform="Linux" />
+        <!-- Arm64 -->
+        <HelixAvailableTargetQueue Include="$(HelixQueueArmDebian)" Platform="Linux" />
 
         <!-- Mac -->
         <HelixAvailableTargetQueue Include="OSX.15.Amd64.Open" Platform="OSX" />

eng/targets/Helix.targets

@@ -16,11 +16,11 @@
 
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
     <SkipHelixQueues>
-      $(HelixQueueAlmaLinux8);
-      $(HelixQueueAlpine318);
-      $(HelixQueueDebian12);
+      $(HelixQueueAlmaLinux);
+      $(HelixQueueAlpine);
+      $(HelixQueueAzureLinux);
+      $(HelixQueueDebian);
       $(HelixQueueFedora40);
-      $(HelixQueueMariner);
       Ubuntu.2004.Amd64.Open;
     </SkipHelixQueues>
     <SkipHelixArm>true</SkipHelixArm>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj

@@ -13,8 +13,8 @@
     <!-- Target the latest runtime patch so the latest version is specified in runtimeconfig.json -->
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <RollForward>LatestPatch</RollForward>
-    <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6 or loongarch64. -->
-    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' OR '$(TargetArchitecture)' == 'riscv64' ">false</PublishReadyToRun>
+    <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6. -->
+    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' ">false</PublishReadyToRun>
     <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
     <!-- Don't use ReadyToRun when explicitly opted out -->
     <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

@@ -14,7 +14,7 @@
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <RollForward>LatestPatch</RollForward>
     <!-- Precompile the shared framework with ReadyToRun. ReadyToRun is not currently supported on s390x or ppc64le or armv6. -->
-    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' OR '$(TargetArchitecture)' == 'loongarch64' OR '$(TargetArchitecture)' == 'riscv64' ">false</PublishReadyToRun>
+    <PublishReadyToRun Condition=" '$(TargetArchitecture)' == 's390x' OR '$(TargetArchitecture)' == 'armv6' OR '$(TargetArchitecture)' == 'ppc64le' ">false</PublishReadyToRun>
     <PublishReadyToRun Condition=" '$(PublishReadyToRun)' == '' AND '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
     <!-- Don't use ReadyToRun when explicitly opted out -->
     <PublishReadyToRun Condition="'$(CrossgenOutput)' == 'false'">false</PublishReadyToRun>

src/ProjectTemplates/README.md

@@ -97,7 +97,7 @@ An entire test project can be configured to skip specific platforms using the `<
 
 ```xml
 <SkipHelixQueues>
-    $(HelixQueueArmDebian12);
+    $(HelixQueueArmDebian);
 </SkipHelixQueues>
 ```
 
@@ -109,7 +109,7 @@ When tests are run as part of the CI infrastructure, a number of different timeo
 
 ##### Helix job timeout
 
-When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props): 
+When queuing test jobs to the Helix infrastructure, a timeout value is passed that the entire Helix job must complete within, i.e. that job running on a single queue. This default value is set in [eng\targets\Helix.props](/eng/targets/Helix.props):
 
 ```xml
 <HelixTimeout>00:45:00</HelixTimeout>

src/ProjectTemplates/test/Templates.Mvc.Tests/Templates.Mvc.Tests.csproj

@@ -27,9 +27,9 @@
     <!-- These tests fail in Helix in Debian and Mariner due to error -901 -->
     <!-- Disabling on those OSes until a better fix can be identified -->
     <SkipHelixQueues>
-      $(HelixQueueArmDebian12);
-      $(HelixQueueDebian12);
-      $(HelixQueueMariner);
+      $(HelixQueueArmDebian);
+      $(HelixQueueAzureLinux);
+      $(HelixQueueDebian);
       $(SkipHelixQueues)
     </SkipHelixQueues>
   </PropertyGroup>

src/Testing/src/xunit/HelixConstants.cs

@@ -6,8 +6,8 @@ namespace Microsoft.AspNetCore.InternalTesting;
 public static class HelixConstants
 {
     public const string Windows10Arm64 = "Windows.10.Arm64v8.Open;";
-    public const string DebianAmd64 = "Debian.11.Amd64.Open;";
-    public const string DebianArm64 = "Debian.11.Arm64.Open;";
-    public const string AlmaLinuxAmd64 = "(AlmaLinux.8.Amd64.Open)Ubuntu.1804[email protected]/dotnet-buildtools/prereqs:almalinux-8-helix-amd64;";
+    public const string DebianAmd64 = "Debian.13.Amd64.Open;";
+    public const string DebianArm64 = "Debian.13.Arm64.Open;";
+    public const string AlmaLinuxAmd64 = "(AlmaLinux.9.Amd64.Open)azurelinux.3[email protected]/dotnet-buildtools/prereqs:almalinux-9-helix-amd64;";
     public const string NativeAotNotSupportedHelixQueues = "All.OSX;All.Linux;Windows.11.Amd64.Client.Open;Windows.11.Amd64.Client;Windows.Amd64.Server2022.Open;Windows.Amd64.Server2022;windows.11.arm64.open;windows.11.arm64";
 }