From 69fa0bc7df19360ea0df041e4dd1ed2f38dc238d Mon Sep 17 00:00:00 2001 From: Justin Chung Date: Thu, 13 Mar 2025 20:32:59 -0500 Subject: [PATCH 1/3] Change package docker image version to 2022 latest --- .pipelines/PowerShell-Packages-Official.yml | 2 +- .pipelines/templates/checkAzureContainer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pipelines/PowerShell-Packages-Official.yml b/.pipelines/PowerShell-Packages-Official.yml index 13fc4cf54be..89af29dce90 100644 --- a/.pipelines/PowerShell-Packages-Official.yml +++ b/.pipelines/PowerShell-Packages-Official.yml @@ -51,7 +51,7 @@ variables: - name: ob_outputDirectory value: '$(Build.ArtifactStagingDirectory)/ONEBRANCH_ARTIFACT' - name: WindowsContainerImage - value: 'onebranch.azurecr.io/windows/ltsc2019/vse2022:latest' # Docker image which is used to build the project + value: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest' # Docker image which is used to build the project - name: LinuxContainerImage value: mcr.microsoft.com/onebranch/cbl-mariner/build:2.0 - group: mscodehub-feed-read-general diff --git a/.pipelines/templates/checkAzureContainer.yml b/.pipelines/templates/checkAzureContainer.yml index f5e36f38a92..014fd1aba8e 100644 --- a/.pipelines/templates/checkAzureContainer.yml +++ b/.pipelines/templates/checkAzureContainer.yml @@ -56,7 +56,7 @@ jobs: inputs: azureSubscription: az-blob-cicd-infra scriptType: inlineScript - azurePowerShellVersion: latestVersion + azurePowerShellVersion: LatestVersion inline: | $containersToDelete = @('$(AzureVersion)', '$(AzureVersion)-private', '$(AzureVersion)-nuget', '$(AzureVersion)-gc') From 729556c2f28dc7be7636caf137f877831289922c Mon Sep 17 00:00:00 2001 From: Justin Chung Date: Mon, 17 Mar 2025 12:22:33 -0500 Subject: [PATCH 2/3] Use Windows Host Version 2022 KS3 --- .pipelines/PowerShell-Packages-Official.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.pipelines/PowerShell-Packages-Official.yml b/.pipelines/PowerShell-Packages-Official.yml index 89af29dce90..30b9e415215 100644 --- a/.pipelines/PowerShell-Packages-Official.yml +++ b/.pipelines/PowerShell-Packages-Official.yml @@ -83,6 +83,9 @@ extends: cloudvault: enabled: false featureFlags: + WindowsHostVersion: + Version: 2022 + Network: KS3 linuxEsrpSigning: true globalSdl: disableLegacyManifest: true From 26280c56c76430351efb1118825edd50d011d2f8 Mon Sep 17 00:00:00 2001 From: Justin Chung Date: Mon, 17 Mar 2025 13:56:31 -0500 Subject: [PATCH 3/3] Use pwsh for AzurePowerShell task --- .pipelines/templates/checkAzureContainer.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.pipelines/templates/checkAzureContainer.yml b/.pipelines/templates/checkAzureContainer.yml index 014fd1aba8e..a6a86214d07 100644 --- a/.pipelines/templates/checkAzureContainer.yml +++ b/.pipelines/templates/checkAzureContainer.yml @@ -57,6 +57,7 @@ jobs: azureSubscription: az-blob-cicd-infra scriptType: inlineScript azurePowerShellVersion: LatestVersion + pwsh: true inline: | $containersToDelete = @('$(AzureVersion)', '$(AzureVersion)-private', '$(AzureVersion)-nuget', '$(AzureVersion)-gc')