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

Author: maraf

.azure/pipelines/ci-public.yml

@@ -76,8 +76,6 @@ variables:
   value: /bl:artifacts/log/Release/Build.CodeSign.binlog
 - name: WindowsInstallersLogArgs
   value: /bl:artifacts/log/Release/Build.Installers.binlog
-- name: WindowsArm64InstallersLogArgs
-  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _SignType
   value: ''
 - name: _InternalRuntimeDownloadArgs
@@ -205,29 +203,14 @@ stages:
                 -sign
                 -buildInstallers
                 -noBuildNative
-                /p:DotNetSignType=$(_SignType)
-                $(_BuildArgs)
-                $(_InternalRuntimeDownloadArgs)
-                $(WindowsInstallersLogArgs)
-        displayName: Build Installers
-
-      # Windows installers bundle and sharedfx msi for arm64
-      - script: ./eng/build.cmd
-                -ci
-                -prepareMachine
-                -noBuildRepoTasks
-                -arch arm64
-                -sign
-                -buildInstallers
-                -noBuildNative
                 -publish
                 /p:DotNetSignType=$(_SignType)
                 /p:AssetManifestFileName=aspnetcore-win.xml
                 $(_BuildArgs)
                 $(_PublishArgs)
                 $(_InternalRuntimeDownloadArgs)
-                $(WindowsArm64InstallersLogArgs)
-        displayName: Build ARM64 Installers
+                $(WindowsInstallersLogArgs)
+        displayName: Build Installers
 
       artifacts:
       - name: Windows_Logs_Attempt_$(System.JobAttempt)