Patch Tuesday for April 2025

scripts/azure-pipelines/android/Dockerfile

@@ -3,7 +3,7 @@
 FROM ubuntu:noble-20250127
 
 ADD https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
-ADD https://builds.openlogic.com/downloadJDK/openlogic-openjdk/11.0.25+9/openlogic-openjdk-11.0.25+9-linux-x64.tar.gz /openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
+ADD https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.14+7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz /OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
 ADD https://dl.google.com/android/repository/commandlinetools-linux-10406996_latest.zip /sdk-commandlinetools-linux-10406996_latest.zip
 ADD https://dl.google.com/android/repository/build-tools_r34-linux.zip /build-tools_r34-linux.zip
 ADD https://dl.google.com/android/repository/platform-34-ext7_r03.zip /platform-34-ext7_r03.zip
@@ -45,6 +45,8 @@ ENV APT_PACKAGES="$APT_PACKAGES libxext-dev libxfixes-dev libxrender-dev \
 ENV APT_PACKAGES="$APT_PACKAGES powershell"
 
 RUN <<END_OF_SCRIPT bash
+set -e
+
 export DEBIAN_FRONTEND=noninteractive
 
 # Apt prereqs itself
@@ -56,7 +58,6 @@ apt-get -y --no-install-recommends install ca-certificates
 ## PowerShell
 dpkg -i packages-microsoft-prod.deb
 rm -f packages-microsoft-prod.deb
-add-apt-repository universe
 
 # Run apt things
 apt-get -y update
@@ -65,8 +66,8 @@ apt-get -y dist-upgrade
 apt-get -y --no-install-recommends install $APT_PACKAGES
 
 # OpenJDK
-tar xzf openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
-rm openlogic-openjdk-11.0.25+9-linux-x64.tar.gz
+tar xzf OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
+rm OpenJDK17U-jdk_x64_linux_hotspot_17.0.14_7.tar.gz
 
 # Android SDK
 unzip -q sdk-commandlinetools-linux-10406996_latest.zip -d android-sdk
@@ -78,17 +79,23 @@ rm build-tools_r34-linux.zip
 
 unzip -q platform-34-ext7_r03.zip -d android-sdk/platforms
 rm platform-34-ext7_r03.zip
+find android-sdk/platforms -type d -exec chmod o+rx '{}' ';'
+find android-sdk/platforms -type f -exec chmod o+r '{}' ';'
 
 unzip -q platform-tools_r35.0.1-linux.zip -d android-sdk
 rm platform-tools_r35.0.1-linux.zip
 
+# JRE for sdk setup
+export JAVA_HOME=/jdk-17.0.14+7
+yes | /android-sdk/cmdline-tools/bin/sdkmanager --sdk_root=/android-sdk --licenses
+
 # Android NDK
-unzip /android-ndk-r27c-linux.zip
+unzip -q /android-ndk-r27c-linux.zip
 rm -f android-ndk-r27c-linux.zip
 
 END_OF_SCRIPT
 
-ENV JAVA_HOME /openlogic-openjdk-11.0.25+9-linux-x64
+ENV JAVA_HOME /jdk-17.0.14+7
 
 ENV ANDROID_HOME /android-sdk
 

scripts/azure-pipelines/android/azure-pipelines.yml

@@ -28,9 +28,9 @@ jobs:
   - name: ANDROID_NDK_HOME
     value: /android-ndk-r27c
   - name: ANDROID_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-03-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-04-08'
   - name: LINUX_DOCKER_IMAGE
-    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-03-12'
+    value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-04-08'
   steps:
     # Note: /mnt is the Azure machines' temporary disk.
   - bash: |

scripts/azure-pipelines/patch-tuesday-checklist.md

@@ -12,14 +12,16 @@
       so in `scripts/azure-pipelines/windows`
 * [ ] 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
+* [ ] Update the first line of android/Dockerfile with the current 'noble' image according to
     https://hub.docker.com/_/ubuntu
-* [ ] Run android/create-docker-image.ps1
-* [ ] Update azure-pipelines.yml to point to the new linux docker image from Azure Container Registry
+* [ ] Update the first line of linux/Dockerfile with the current 'jammy' image according to
+    https://hub.docker.com/_/ubuntu
+* [ ] Run create-docker-images.ps1
+* [ ] Update android/azure-pipelines.yml and linux/azure-pipelines.yml to point to the new docker
+      images
 * [ ] Run windows/create-image.ps1
-* [ ] Update azure-pipelines.yml to point to the new Android image.
 * [ ] Submit PR with those changes and merge it.
 * [ ] In the Azure portal, mark the newly created image as the 'latest' one.
 * [ ] Mint a new macOS base box.  (See instructions in `scripts/azure-pipelines/osx/README.md`)
 * [ ] Deploy the new base box to all hosts.
-* [ ] Update the software on the CTI's machine #12 to match.
+* [ ] Update the software on the CTI's machine #1 to match.

scripts/azure-pipelines/windows-unstable/azure-pipelines.yml

@@ -6,7 +6,7 @@ jobs:
 - job: x64_windows
   pool:
     name: vcpkg-testing-msvc
-    demands: ImageVersionOverride -equals 2025.02.14
+    demands: ImageVersionOverride -equals 2025.04.08
   timeoutInMinutes: 2880 # 2 days
   variables:
   - name: WORKING_ROOT

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 2025.03.12
+    demands: ImageVersionOverride -equals 2025.04.08
   timeoutInMinutes: 2880 # 2 days
   variables:
   - name: WORKING_ROOT

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.68.0-x64.msi'
+  $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.71.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.68.0-x64.msi?$SasToken"
+  $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.71.0-x64.msi?$SasToken"
 }
 
 DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')

scripts/azure-pipelines/windows/deploy-cuda.ps1

@@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$CudaUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
   Write-Host 'Downloading from the Internet'
-  $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.8.0/local_installers/cuda_12.8.0_571.96_windows.exe'
+  $CudaUrl = 'https://developer.download.nvidia.com/compute/cuda/12.8.1/local_installers/cuda_12.8.1_572.61_windows.exe'
 } else {
   Write-Host 'Downloading from vcpkgimageminting using SAS token'
   $SasToken = $SasToken.Replace('"', '')
-  $CudaUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cuda_12.8.0_571.96_windows.exe?$SasToken"
+  $CudaUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cuda_12.8.1_572.61_windows.exe?$SasToken"
 }
 
 # https://docs.nvidia.com/cuda/cuda-installation-guide-microsoft-windows/index.html

scripts/azure-pipelines/windows/deploy-cudnn.ps1

@@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$CudnnUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
   Write-Host 'Downloading from the Internet'
-  $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.7.0.66_cuda12-archive.zip'
+  $CudnnUrl = 'https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip'
 } else {
   Write-Host 'Downloading from vcpkgimageminting using SAS token'
   $SasToken = $SasToken.Replace('"', '')
-  $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.7.0.66_cuda12-archive.zip?$SasToken"
+  $CudnnUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip?$SasToken"
 }
 
 DownloadAndUnzip -Name 'CUDNN' -Url $CudnnUrl -Destination "$env:ProgramFiles\NVIDIA GPU Computing Toolkit\CUDA\v12.8"

scripts/azure-pipelines/windows/deploy-install-disk.ps1

@@ -27,7 +27,7 @@ Param(
     [string]$Label
 )
     if ($Letter.Length -ne 1) {
-        throw "Bad drive letter $Letter, expected only one letter. (Did you accidentially add a : ?)"
+        throw "Bad drive letter $Letter, expected only one letter. (Did you accidentally add a : ?)"
     }
 
     try {

scripts/azure-pipelines/windows/deploy-pwsh.ps1

@@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
 [string]$PwshUrl
 if ([string]::IsNullOrEmpty($SasToken)) {
   Write-Host 'Downloading from the Internet'
-  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.6/PowerShell-7.4.6-win-x64.msi'
+  $PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.5.0/PowerShell-7.5.0-win-x64.msi'
 } else {
   Write-Host 'Downloading from vcpkgimageminting using SAS token'
   $SasToken = $SasToken.Replace('"', '')
-  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.4.6-win-x64.msi?$SasToken"
+  $PwshUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/PowerShell-7.5.0-win-x64.msi?$SasToken"
 }
 
 DownloadAndInstall -Url $PwshUrl -Name 'PowerShell Core' -Args @('/quiet', '/norestart')

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.13.3
-$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/9b2a4ec4-2233-4550-bb74-4e7facba2e03/fb4c578235d7e5cb0b1731772624fdd6cdfbb5ea0b6daf77f5988e70dfaf5615/vs_Enterprise.exe'
+# 17.13.6
+$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/8fada5c7-8417-4239-acc3-bd499af09222/b9e51a6eacaa38415ad70c4e0f0034d7c213fcdfabea2d96101e2255eb717250/vs_Enterprise.exe'
 $Workloads = @(
   'Microsoft.VisualStudio.Workload.NativeDesktop',
   'Microsoft.VisualStudio.Workload.Universal',