Revert "Patch Tuesday for May 2024" (#38890)

Reverts #38802

Author: BillyONeal

scripts/azure-pipelines/android/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.4
 # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
-FROM ubuntu:focal-20240427
+FROM ubuntu:focal-20240216
 
 ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb
 ADD https://dl.google.com/android/repository/android-ndk-r25c-linux.zip /android-ndk-r25c-linux.zip

scripts/azure-pipelines/azure-pipelines.yml

@@ -2,7 +2,11 @@
 # SPDX-License-Identifier: MIT
 #
 variables:
-  linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-05-17'
+  linux-pool: 'PrLin-1ES-Pool'
+  windows-pool: 'PrWin-1ES'
+  osx-pool: 'PrOsx-2024-01-18'
+  osx-arm64-pool: 'PrOsx-2024-01-22-arm64'
+  linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-04-11'
 
 parameters:
   - name: vcpkgToolSha
@@ -33,62 +37,70 @@ jobs:
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x86_windows
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows_static
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_windows_static_md
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: x64_uwp
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: arm64_windows
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: windows/azure-pipelines.yml
   parameters:
     jobName: arm64_uwp
+    poolName: $(windows-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: osx/azure-pipelines.yml
   parameters:
     jobName: x64_osx
-    poolName: 'PrOsx-2024-01-18'
+    poolName: $(osx-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: osx/azure-pipelines.yml
   parameters:
     jobName: arm64_osx
-    poolName: 'PrOsx-2024-01-22-arm64'
+    poolName: $(osx-arm64-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 
 - template: linux/azure-pipelines.yml
   parameters:
     jobName: x64_linux
+    poolName: $(linux-pool)
     vcpkgToolSha: ${{ parameters.vcpkgToolSha }}
     tripletPattern: ${{ parameters.tripletPattern }}
 

scripts/azure-pipelines/linux/azure-pipelines.yml

@@ -10,6 +10,8 @@ parameters:
   - name: jobName
     type: string
     default: 'x64_linux'
+  - name: poolName
+    type: string
   - name: tripletPattern
     displayName: 'Enable the triplets which contain this substring'
     type: string
@@ -19,7 +21,7 @@ jobs:
 - job: x64_linux
   condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
   pool:
-    name: PrLin-1ES-Pool
+    name: ${{ parameters.poolName }}
   workspace:
     clean: resources
   timeoutInMinutes: 1440 # 1 day

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

@@ -10,6 +10,8 @@ parameters:
   - name: jobName
     type: string
     default: 'x86_windows'
+  - name: poolName
+    type: string
   - name: tripletPattern
     displayName: 'Enable the triplets which contain this substring'
     type: string
@@ -19,8 +21,7 @@ jobs:
 - job: ${{ parameters.jobName }}
   condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
   pool:
-    name: PrWin-1ES
-    demands: ImageVersionOverride -equals 2024.05.20
+    name: ${{ parameters.poolName }}
   workspace:
     clean: resources
   timeoutInMinutes: 2880 # 2 days

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

@@ -1,4 +1,4 @@
 $azcopyZipPath = "$PSScriptRoot\azcopyv10.zip"
-& curl.exe -L -o $azcopyZipPath 'https://azcopyvnext.azureedge.net/releases/release-10.24.0-20240326/azcopy_windows_amd64_10.24.0.zip'
+& curl.exe -L -o $azcopyZipPath 'https://azcopyvnext.azureedge.net/releases/release-10.23.0-20240129/azcopy_windows_amd64_10.23.0.zip'
 Expand-Archive -LiteralPath $azcopyZipPath -DestinationPath $env:PROGRAMFILES
 Remove-Item -LiteralPath $azcopyZipPath -Force

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

@@ -5,5 +5,5 @@
 
 # REPLACE WITH UTILITY-PREFIX.ps1
 
-$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.2/PowerShell-7.4.2-win-x64.msi'
+$PwshUrl = 'https://github.com/PowerShell/PowerShell/releases/download/v7.4.1/PowerShell-7.4.1-win-x64.msi'
 InstallMSI -Url $PwshUrl -Name 'PowerShell Core'

scripts/azure-pipelines/windows/deploy-visual-studio.ps1

@@ -6,7 +6,7 @@
 # REPLACE WITH UTILITY-PREFIX.ps1
 
 # See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
-$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/a8a3940c-d415-4078-8df8-6af787f56dfa/ff486670bce61323e52b208ecbb71dc05b034c8bf156d0b7bfc0ad67b2611445/vs_Enterprise.exe'
+$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/ec7bd8ef-2c51-4e4f-a83f-9087ffbe8b76/f7fdf51d7c15b65c60f0f358776576f4423417da603ef46a213bd69ad463e9e2/vs_Enterprise.exe'
 $Workloads = @(
   'Microsoft.VisualStudio.Workload.NativeDesktop',
   'Microsoft.VisualStudio.Workload.Universal',