From 67edf5edfe36409aedde52f906c1ee7c2f6e9473 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 15 Aug 2025 11:30:24 -0700 Subject: [PATCH 1/2] Update ci.yml --- .azure/pipelines/ci.yml | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index ab0d36e1bedf..7c968f353eef 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -78,8 +78,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: _InternalRuntimeDownloadArgs value: -RuntimeSourceFeed https://ci.dot.net/internal -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) @@ -255,33 +253,16 @@ extends: -sign -buildInstallers -noBuildNative - /p:DotNetSignType=$(_SignType) - $(_BuildArgs) - $(_InternalRuntimeDownloadArgs) - $(WindowsInstallersLogArgs) - env: - MSBUILDUSESERVER: "1" - 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) + $(WindowsInstallersLogArgs) env: MSBUILDUSESERVER: "1" - displayName: Build ARM64 Installers + displayName: Build Installers artifacts: - name: Windows_Logs_Attempt_$(System.JobAttempt) From 19cd4b22f040da6444cc4db5b50d797e3f732e16 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Fri, 15 Aug 2025 11:31:34 -0700 Subject: [PATCH 2/2] Update ci-public.yml --- .azure/pipelines/ci-public.yml | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml index e0d7b2fae27e..22258ffb0e73 100644 --- a/.azure/pipelines/ci-public.yml +++ b/.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)