Patch Tuesday for January 2025 (#43393)

2025-01-23 11:34:28 -08:00 · 2025-01-23 11:34:28 -08:00 · 70abac5865
parent 01be99fec0
commit 70abac5865
10 changed files with 80 additions and 37 deletions
--- a/scripts/azure-pipelines/android/azure-pipelines.yml
+++ b/scripts/azure-pipelines/android/azure-pipelines.yml
@ -5,8 +5,6 @@
 parameters:
  - name: jobName
    type: string
-  - name: dockerImage
-    type: string
  - name: tripletPattern
    displayName: 'Enable the triplets which contain this substring'
    type: string
@ -28,6 +26,8 @@ jobs:
    value: /mnt/vcpkg-ci/downloads
  - name: ANDROID_NDK_HOME
    value: /android-ndk-r27c
+  - name: ANDROID_DOCKER_IMAGE
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-01-20'
  steps:
    # Note: /mnt is the Azure machines' temporary disk.
  - bash: |
@ -47,10 +47,10 @@ jobs:
      scriptLocation: 'inlineScript'  # Be very very careful that the exit code from the last pwsh is reported correctly
      inlineScript: |
        az acr login --name vcpkgandroidwus
-        docker pull ${{ parameters.dockerImage }}
+        docker pull ${{ variables.ANDROID_DOCKER_IMAGE }}
        docker run --rm \
          --mount type=bind,source=$(Build.Repository.LocalPath),target=/vcpkg \
-          ${{ parameters.dockerImage }} \
+          ${{ variables.ANDROID_DOCKER_IMAGE }} \
          ./bootstrap-vcpkg.sh
        end=`date -u -d "2 days" '+%Y-%m-%dT%H:%MZ'`
        assetSas=`az storage container generate-sas --name cache --account-name vcpkgassetcachewus --as-user --auth-mode login --https-only --permissions rcl --expiry $end -o tsv`
@ -66,7 +66,7 @@ jobs:
        --mount type=bind,source=/mnt/vcpkg-ci,target=/mnt/vcpkg-ci \
        --env X_VCPKG_ASSET_SOURCES="x-azurl,https://vcpkgassetcachewus.blob.core.windows.net/cache,$assetSas,readwrite" \
        --env ANDROID_NDK_HOME="${{ variables.ANDROID_NDK_HOME }}" \
-        ${{ parameters.dockerImage }} \
+        ${{ variables.ANDROID_DOCKER_IMAGE }} \
        pwsh \
         -File /vcpkg/scripts/azure-pipelines/test-modified-ports.ps1 \
         -Triplet ${{ replace(parameters.jobName, '_', '-') }} \
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@ -1,9 +1,6 @@
 # Copyright (c) Microsoft Corporation.
 # SPDX-License-Identifier: MIT
 #
-variables:
-  linux-docker-image: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2024-12-16'
-
 parameters:
  - name: vcpkgToolSha
    displayName: 'Custom SHA of vcpkg-tool to use rather than bootstrap'
@ -86,17 +83,14 @@ jobs:
 - template: android/azure-pipelines.yml
  parameters:
    jobName: arm_neon_android
-    dockerImage: $(linux-docker-image)
    tripletPattern: ${{ parameters.tripletPattern }}

 - template: android/azure-pipelines.yml
  parameters:
    jobName: x64_android
-    dockerImage: $(linux-docker-image)
    tripletPattern: ${{ parameters.tripletPattern }}

 - template: android/azure-pipelines.yml
  parameters:
    jobName: arm64_android
-    dockerImage: $(linux-docker-image)
    tripletPattern: ${{ parameters.tripletPattern }}
--- a/scripts/azure-pipelines/patch-tuesday-checklist.md
+++ b/scripts/azure-pipelines/patch-tuesday-checklist.md
@ -10,7 +10,7 @@
      (Most often PowerShell needs to be updated)
 * [ ] Check for any other software for the Windows images we wish to update and make the edits to do
      so in `scripts/azure-pipelines/windows`
-* [ ] Check for any updates possible to `vcpkgTools.xml`. Note that PowerShell currently uses the
+* [ ] Check for any updates possible to `vcpkg-tools.json`. Note that PowerShell currently uses the
    7.2.x series due to customer reported problems on older Windows with 7.3.x and later.
 * [ ] Update the first line of android/Dockerfile with the current 'focal' image according to
    https://hub.docker.com/_/ubuntu
--- a/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
@ -6,7 +6,7 @@ jobs:
 - job: x64_windows
  pool:
    name: vcpkg-testing-msvc
-    demands: ImageVersionOverride -equals 2024.12.16
+    demands: ImageVersionOverride -equals 2025.01.21
  workspace:
    clean: resources
  timeoutInMinutes: 2880 # 2 days
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@ -20,7 +20,7 @@ jobs:
  condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
  pool:
    name: PrWin-WUS
-    demands: ImageVersionOverride -equals 2024.12.16
+    demands: ImageVersionOverride -equals 2025.01.21
  workspace:
    clean: resources
  timeoutInMinutes: 2880 # 2 days
--- a/scripts/azure-pipelines/windows/create-image.ps1
+++ b/scripts/azure-pipelines/windows/create-image.ps1
@ -20,7 +20,7 @@ $Prefix = "Win-$DatePrefixComponent"
 $GalleryImageVersion = $DatePrefixComponent.Replace('-','.')
 $VMSize = 'Standard_D8ads_v5'
 $ProtoVMName = 'PROTOTYPE'
-$WindowsServerSku = '2022-datacenter-azure-edition'
+$WindowsServerSku = '2025-datacenter-azure-edition'
 $ErrorActionPreference = 'Stop'

 $ProgressActivity = 'Creating Windows Image'
@ -95,7 +95,8 @@ function Wait-Shutdown {
 $AdminPW = New-Password
 $Credential = New-Object System.Management.Automation.PSCredential ("AdminUser", $AdminPW)

-$VirtualNetwork = Get-AzVirtualNetwork -ResourceGroupName 'vcpkg-image-minting' -Name 'vcpkg-image-mintingNetwork'
+$VirtualNetwork = Get-AzVirtualNetwork -ResourceGroupName 'vcpkg-image-minting' -Name 'vcpkg-image-minting-wus3'
+$Subnet = $VirtualNetwork.Subnets | Where-Object -Property 'Name' -EQ -Value 'image-minting' | Select-Object -First 1

 ####################################################################################################
 Write-Progress `
@ -108,7 +109,7 @@ $Nic = New-AzNetworkInterface `
  -Name $NicName `
  -ResourceGroupName 'vcpkg-image-minting' `
  -Location $Location `
-  -Subnet $VirtualNetwork.Subnets[0] `
+  -Subnet $Subnet `
  -EnableAcceleratedNetworking

 $VM = New-AzVMConfig -Name $ProtoVMName -VMSize $VMSize -SecurityType TrustedLaunch -IdentityType SystemAssigned
--- a/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
+++ b/scripts/azure-pipelines/windows/deploy-azure-cli.ps1
@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$AzCliUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
  Write-Host 'Downloading from the Internet'
-  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.67.0-x64.msi'
+  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.68.0-x64.msi'
 } else {
  Write-Host 'Downloading from vcpkgimageminting using SAS token'
  $SasToken = $SasToken.Replace('"', '')
-  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.67.0-x64.msi?$SasToken"
+  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.68.0-x64.msi?$SasToken"
 }

 DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')
--- a/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
+++ b/scripts/azure-pipelines/windows/deploy-visual-studio.ps1
@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 }

 # See https://learn.microsoft.com/visualstudio/releases/2022/release-history
-# 17.12.3
-$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/f2819554-a618-400d-bced-774bb5379965/6dec611eac2a146142b25497888f6b518069eeeb9f5ac32ce29ad5bebd753a64/vs_Enterprise.exe'
+# 17.12.4
+$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/9e5046bb-ab15-4a45-9546-cbabed333482/e7bd4bc12f0345ae1708ec3c7e442a0ddf9f5e390f711feef4758ef0719b819a/vs_Enterprise.exe'
 $Workloads = @(
  'Microsoft.VisualStudio.Workload.NativeDesktop',
  'Microsoft.VisualStudio.Workload.Universal',
--- a/scripts/azure-pipelines/windows/utility-prefix.ps1
+++ b/scripts/azure-pipelines/windows/utility-prefix.ps1
@ -64,7 +64,10 @@ Function DownloadAndInstall {
      $tempPath = Get-TempFilePath
      New-Item -ItemType Directory -Path $tempPath -Force | Out-Null
      $LocalPath = Join-Path $tempPath $LocalName
-      curl.exe -L -o $LocalPath $Url
+      curl.exe --fail -L -o $LocalPath $Url
+      if (-Not $?) {
+        Write-Error 'Download failed!'
+      }
      $doRemove = $true
    }

@ -129,7 +132,10 @@ Function DownloadAndUnzip {
      New-Item -ItemType Directory -Path $tempPath -Force | Out-Null
      $zipPath = Join-Path $tempPath $LocalName
      Write-Host "Downloading $Name ( $Url -> $zipPath )..."
-      curl.exe -L -o $zipPath $Url
+      curl.exe --fail -L -o $zipPath $Url
+      if (-Not $?) {
+        Write-Error 'Download failed!'
+      }
      $doRemove = $true
    }

--- a/scripts/vcpkg-tools.json
+++ b/scripts/vcpkg-tools.json
@ -62,6 +62,7 @@
      "name": "cmake",
      "os": "linux",
      "version": "3.30.1",
+      "arch": "amd64",
      "executable": "cmake-3.30.1-linux-x86_64/bin/cmake",
      "url": "https://github.com/Kitware/CMake/releases/download/v3.30.1/cmake-3.30.1-linux-x86_64.tar.gz",
      "sha512": "84ce1333ed696a1736986fba2853c5d8db0e4c9addaf4a4723911248c6d49ecf545adf8bd46091d198fc7bd1e6c896798661463aa1ce3a726a093883aaa19adf",
@ -70,11 +71,22 @@
    {
      "name": "git",
      "os": "windows",
+      "arch": "arm64",
      "version": "2.7.4",
      "executable": "mingw64/bin/git.exe",
-      "url": "https://github.com/git-for-windows/git/releases/download/v2.43.0.windows.1/PortableGit-2.43.0-64-bit.7z.exe",
-      "sha512": "02ec40f55a6de18f305530e9415b6ce0a597359ebb9a58cf727ac84eceb0003b0f437941b76872b6568157a333c8e6e8d865a36faf874fd5f04774deb6a9387a",
-      "archive": "PortableGit-2.43.0-32-bit.7z.exe"
+      "url": "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/PortableGit-2.47.1.2-arm64.7z.exe",
+      "sha512": "2e57cebc1f567bbb63b92825e4b9625de24bc897c4ea9aa8d88f70b5ad69c53005e062f94b60d10269855f2edd0505d5d6233c6c067d6af1bbedde66c9b856c3",
+      "archive": "PortableGit-2.47.1.2-arm64.7z.exe"
+    },
+    {
+      "name": "git",
+      "os": "windows",
+      "arch": "amd64",
+      "version": "2.7.4",
+      "executable": "mingw64/bin/git.exe",
+      "url": "https://github.com/git-for-windows/git/releases/download/v2.47.1.windows.2/PortableGit-2.47.1.2-64-bit.7z.exe",
+      "sha512": "a96dd809b2dc940d871a84a2c3f2f4600552fe67f437ffeb29abb3b3da636f3534fa3118af61fca9349e97ec8dbb54210c213dee0c8beadbd9ba27a6c091dd98",
+      "archive": "PortableGit-2.47.1.2-64-bit.7z.exe"
    },
    {
      "name": "git",
@ -156,27 +168,57 @@
    {
      "name": "coscli",
      "os": "windows",
-      "version": "0.11.0",
-      "executable": "coscli-windows.exe",
-      "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-windows.exe",
-      "sha512": "38a521ec80cdb6944124f4233d7e71eed8cc9f9be2c0c736269915d21c3718ea8131e4516bb6eeada6df331f5fa8f47a299907e50ee9edbe0114444520974d06"
+      "version": "1.0.3",
+      "arch": "amd64",
+      "executable": "coscli-v1.0.3-windows-amd64.exe",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-windows-amd64.exe",
+      "sha512": "909b1c48e3c0dc0c3a4bd32d865db914307f65d6266c4f9025a4a6aea1e75b817581b8257633e74b3cab86b4f2e343d049a9ce65ceaf6b85dacdd55afd74d183"
    },
    {
      "name": "coscli",
      "os": "linux",
-      "version": "0.11.0",
-      "executable": "coscli-linux",
-      "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-linux",
-      "sha512": "9c930a1d308e9581a0e2fdfe3751ea7fe13d6068df90ca6465740ec3eda034202ef71ec54c99e90015ff81aa68aa1489567db5e411e222eb7258704bdac7e924"
+      "version": "1.0.3",
+      "arch": "arm",
+      "executable": "coscli-v1.0.3-linux-arm",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-linux-arm",
+      "sha512": "28f43cc678665b87da19a26838037552638aea96b541171f0e5f71eb3098fff3b2325f96c81532fb102dcb09f8bbd707b8d269d14879a4404b2b31336ced15f7"
+    },
+    {
+      "name": "coscli",
+      "os": "linux",
+      "version": "1.0.3",
+      "arch": "arm64",
+      "executable": "coscli-v1.0.3-linux-arm64",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-linux-arm64",
+      "sha512": "c277b8b921df9459045c7a9d4faefa8a86df93d75ab58f228ca168175226d58adeb9b78af2aac0638feb2232c0fa5d5f24bf4a76f7bd2822a9f21662b23fa3d6"
+    },
+    {
+      "name": "coscli",
+      "os": "linux",
+      "version": "1.0.3",
+      "arch": "amd64",
+      "executable": "coscli-v1.0.3-linux-amd64",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-linux-amd64",
+      "sha512": "c91b2665682969e389b3c70c663eb694024b2f7ed68e059d2b9f44000259f6c6466cc33667b8557a2999b2d2ed912b405f997420c56df6dea50576368b1b8536"
    },
    {
      "name": "coscli",
      "os": "osx",
-      "version": "0.11.0",
-      "executable": "coscli-mac",
-      "url": "https://github.com/tencentyun/coscli/releases/download/v0.11.0-beta/coscli-mac",
+      "version": "1.0.3",
+      "arch": "arm64",
+      "executable": "coscli-v1.0.3-darwin-arm64",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-darwin-arm64",
      "sha512": "9556335bfc8bc14bace6dfced45fa77fb07c80f08aa975e047a54efda1d19852aae0ea68a5bc7f04fbd88e3edce5a73512a61216b1c5ff4cade224de4a9ab8db"
    },
+    {
+      "name": "coscli",
+      "os": "osx",
+      "version": "1.0.3",
+      "arch": "amd64",
+      "executable": "coscli-v1.0.3-darwin-amd64",
+      "url": "https://github.com/tencentyun/coscli/releases/download/v1.0.3/coscli-v1.0.3-darwin-amd64",
+      "sha512": "aaa7fe9e71ef46246d08a59777898ea59a4ca6261ca9139e02ed2ebdc026295fa8d24d48cda2973c05fefe82379ad007196e08973dde6ce36c816df1dcfead2e"
+    },
    {
      "name": "installerbase",
      "os": "windows",