3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 18:31:15 +08:00
Code Issues Projects Releases Wiki Activity

Patch Tuesday for October 2024 (#41585)

Browse Source
This commit is contained in:
Billy O'Neal 2024-10-18 00:36:30 -07:00 committed by GitHub
parent 4d22d579c2
commit da5024ed2b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/azure-pipelines/android/Dockerfile
View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4 # syntax=docker/dockerfile:1.4
# DisableDockerDetector "Used to build the container deployed to Azure Container Registry" # DisableDockerDetector "Used to build the container deployed to Azure Container Registry"
FROM ubuntu:focal-20240530 FROM ubuntu:focal-20240918
ADD https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb /packages-microsoft-prod.deb 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-r26d-linux.zip /android-ndk-r26d-linux.zip ADD https://dl.google.com/android/repository/android-ndk-r26d-linux.zip /android-ndk-r26d-linux.zip

2
scripts/azure-pipelines/azure-pipelines.yml
View File

@ -2,7 +2,7 @@
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# #
variables: variables:
linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-07-11' linux-docker-image: 'vcpkgandroidwus3.azurecr.io/vcpkg-android:2024-10-15'
parameters: parameters:
- name: vcpkgToolSha - name: vcpkgToolSha

2
scripts/azure-pipelines/windows-unstable/azure-pipelines.yml
View File

@ -6,7 +6,7 @@ jobs:
- job: x64_windows - job: x64_windows
pool: pool:
name: vcpkg-testing-msvc name: vcpkg-testing-msvc
demands: ImageVersionOverride -equals 2024.09.11 demands: ImageVersionOverride -equals 2024.10.14
workspace: workspace:
clean: resources clean: resources
timeoutInMinutes: 2880 # 2 days timeoutInMinutes: 2880 # 2 days

2
scripts/azure-pipelines/windows/azure-pipelines.yml
View File

@ -20,7 +20,7 @@ jobs:
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}')) condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
pool: pool:
name: PrWin-1ES name: PrWin-1ES
demands: ImageVersionOverride -equals 2024.09.11 demands: ImageVersionOverride -equals 2024.10.14
workspace: workspace:
clean: resources clean: resources
timeoutInMinutes: 2880 # 2 days timeoutInMinutes: 2880 # 2 days

4
scripts/azure-pipelines/windows/deploy-azure-cli.ps1
View File

@ -9,10 +9,10 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
[string]$AzCliUrl [string]$AzCliUrl
if ([string]::IsNullOrEmpty($SasToken)) { if ([string]::IsNullOrEmpty($SasToken)) {
$AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.64.0-x64.msi' $AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.65.0-x64.msi'
} else { } else {
$SasToken = $SasToken.Replace('"', '') $SasToken = $SasToken.Replace('"', '')
$AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.64.0-x64.msi?$SasToken" $AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.65.0-x64.msi?$SasToken"
} }
DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart') DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')

4
scripts/azure-pipelines/windows/deploy-visual-studio.ps1
View File

@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
} }
# See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history # See https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history
# 17.11.3 # 17.11.5
$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/030a0062-e1e5-4a6c-9385-a6f146dbd9db/85d31bd580a0b36936164315bd423d22af90f90d180a540ef4245522e0bcd085/vs_Enterprise.exe' $VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/69e24482-3b48-44d3-af65-51f866a08313/2e8384dde0c87bc49830e325c7565c25278340c83f6da46b8c14101dd75d8f15/vs_Enterprise.exe'
$Workloads = @( $Workloads = @(
'Microsoft.VisualStudio.Workload.NativeDesktop', 'Microsoft.VisualStudio.Workload.NativeDesktop',
'Microsoft.VisualStudio.Workload.Universal', 'Microsoft.VisualStudio.Workload.Universal',