mirror of
https://github.com/microsoft/vcpkg.git
synced 2026-01-18 01:11:23 +01:00
Patch Tuesday for January 2026 (#49453)
This commit is contained in:
@@ -1,19 +1,19 @@
|
||||
set(MSMPI_VERSION "10.1.12498")
|
||||
set(MSMPI_VERSION "10.1.12498.52")
|
||||
set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}")
|
||||
|
||||
vcpkg_download_distfile(SDK_ARCHIVE
|
||||
URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisdk.msi"
|
||||
FILENAME "msmpisdk-${MSMPI_VERSION}-b0087dfd.msi"
|
||||
SHA512 b0087dfd21423bf87b94b17d7cb03576838585371bbf8b03cca95c3ad73670108c7bc6517b0de852ef595072cc4143be2011636e7242bcb080394d94294848a7
|
||||
URLS "https://download.microsoft.com/download/7/2/7/72731ebb-b63c-4170-ade7-836966263a8f/msmpisdk.msi"
|
||||
FILENAME "msmpisdk-${MSMPI_VERSION}-5083f186.msi"
|
||||
SHA512 5083f186b463895e804ae73bb36a16f7d5706340a6dc929c0c511b510ad80bd89d97bdde58d2dd836ebab032258c262f0601a9950f9f26f7c05f9b9ea0073cd0
|
||||
)
|
||||
|
||||
|
||||
#to enable CI, you should modify the following URL also in ${VCPKG_ROOT}/scripts/azure-pipelines/windows/provision-image.ps1
|
||||
macro(download_msmpi_redistributable_package)
|
||||
vcpkg_download_distfile(REDIST_ARCHIVE
|
||||
URLS "https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe"
|
||||
FILENAME "msmpisetup-${MSMPI_VERSION}.exe"
|
||||
SHA512 1ee463e7dfc3e55a7ac048fdfde13fef09a5eea4b74d8fd7c22a7aad667a025b467ce939e5de308e25bbc186c3fe66e0e24ac03a3741656fc7558f2af2fa132a
|
||||
URLS "https://download.microsoft.com/download/7/2/7/72731ebb-b63c-4170-ade7-836966263a8f/msmpisetup.exe"
|
||||
FILENAME "msmpisetup-${MSMPI_VERSION}-d09862be.exe"
|
||||
SHA512 d09862be9fec0fe5377e2c472dd8c9aff9fbc2db7f2c1f4880a59ed64d51339bdfe3cd70af0f3443ba864bfedf42d684c943ba8c805774816c7760f70749d0f0
|
||||
)
|
||||
endmacro()
|
||||
|
||||
@@ -32,7 +32,7 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}")
|
||||
)
|
||||
file(READ "${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log" MPIEXEC_OUTPUT)
|
||||
|
||||
if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]")
|
||||
if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)\\]")
|
||||
if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION)
|
||||
download_msmpi_redistributable_package()
|
||||
|
||||
@@ -41,6 +41,7 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}")
|
||||
" Expected version: ${MSMPI_VERSION}\n"
|
||||
" Found version: ${CMAKE_MATCH_1}\n"
|
||||
" Please upgrade the installed version on your system.\n"
|
||||
" You may need to remove the already installed version before installing a new one.\n"
|
||||
" The appropriate installer for the expected version has been downloaded to:\n"
|
||||
" ${REDIST_ARCHIVE}\n")
|
||||
endif()
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "msmpi",
|
||||
"version": "10.1.12498",
|
||||
"port-version": 5,
|
||||
"version": "10.1.12498.52",
|
||||
"description": "Microsoft MPI (MS-MPI) is a Microsoft implementation of the Message Passing Interface standard for developing and running parallel applications on the Windows platform.",
|
||||
"homepage": "https://docs.microsoft.com/en-us/message-passing-interface/microsoft-mpi",
|
||||
"license": "MIT",
|
||||
|
||||
@@ -28,9 +28,9 @@ jobs:
|
||||
- name: ANDROID_NDK_HOME
|
||||
value: /android-ndk-r28c
|
||||
- name: ANDROID_DOCKER_IMAGE
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2025-12-10'
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-android:2026-01-14'
|
||||
- name: LINUX_DOCKER_IMAGE
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-12-10'
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-14'
|
||||
steps:
|
||||
# Note: /mnt is the Azure machines' temporary disk.
|
||||
- bash: |
|
||||
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
- name: VCPKG_DOWNLOADS
|
||||
value: /mnt/vcpkg-ci/downloads
|
||||
- name: LINUX_DOCKER_IMAGE
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2025-12-10'
|
||||
value: 'vcpkgandroidwus.azurecr.io/vcpkg-linux:2026-01-14'
|
||||
steps:
|
||||
# Note: /mnt is the Azure machines' temporary disk.
|
||||
- bash: |
|
||||
|
||||
@@ -6,7 +6,7 @@ jobs:
|
||||
- job: x64_windows
|
||||
pool:
|
||||
name: vcpkg-testing-msvc
|
||||
demands: ImageVersionOverride -equals 2025.12.10
|
||||
demands: ImageVersionOverride -equals 2026.01.14
|
||||
timeoutInMinutes: 2880 # 2 days
|
||||
variables:
|
||||
- name: WORKING_ROOT
|
||||
|
||||
@@ -20,7 +20,7 @@ jobs:
|
||||
condition: and(succeeded(), contains('^${{ replace(parameters.jobName, '_', '-') }}$', '${{ parameters.tripletPattern }}'))
|
||||
pool:
|
||||
name: PrWin-WUS
|
||||
demands: ImageVersionOverride -equals 2025.12.10
|
||||
demands: ImageVersionOverride -equals 2026.01.14
|
||||
timeoutInMinutes: 2880 # 2 days
|
||||
variables:
|
||||
- name: WORKING_ROOT
|
||||
|
||||
@@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
|
||||
[string]$AzCopyUrl
|
||||
if ([string]::IsNullOrEmpty($SasToken)) {
|
||||
Write-Host 'Downloading from the Internet'
|
||||
$AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_windows_amd64_10.31.0.zip'
|
||||
$AzCopyUrl = 'https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_windows_amd64_10.31.1.zip'
|
||||
} else {
|
||||
Write-Host 'Downloading from vcpkgimageminting using SAS token'
|
||||
$SasToken = $SasToken.Replace('"', '')
|
||||
$AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.31.0.zip?$SasToken"
|
||||
$AzCopyUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azcopy_windows_amd64_10.31.1.zip?$SasToken"
|
||||
}
|
||||
|
||||
mkdir -Force "C:\AzCopy10"
|
||||
|
||||
@@ -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.81.0-x64.msi'
|
||||
$AzCliUrl = 'https://azcliprod.blob.core.windows.net/msi/azure-cli-2.82.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.81.0-x64.msi?$SasToken"
|
||||
$AzCliUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/azure-cli-2.82.0-x64.msi?$SasToken"
|
||||
}
|
||||
|
||||
DownloadAndInstall -Url $AzCliUrl -Name 'Azure CLI' -Args @('/quiet', '/norestart')
|
||||
|
||||
@@ -10,11 +10,11 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
|
||||
[string]$MpiUrl
|
||||
if ([string]::IsNullOrEmpty($SasToken)) {
|
||||
Write-Host 'Downloading from the Internet'
|
||||
$MpiUrl = 'https://download.microsoft.com/download/a/5/2/a5207ca5-1203-491a-8fb8-906fd68ae623/msmpisetup.exe'
|
||||
$MpiUrl = 'https://download.microsoft.com/download/7/2/7/72731ebb-b63c-4170-ade7-836966263a8f/msmpisetup.exe'
|
||||
} else {
|
||||
Write-Host 'Downloading from vcpkgimageminting using SAS token'
|
||||
$SasToken = $SasToken.Replace('"', '')
|
||||
$MpiUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/msmpisetup.exe?$SasToken"
|
||||
$MpiUrl = "https://vcpkgimageminting.blob.core.windows.net/assets/msmpisetup-10.1.12498.52.exe?$SasToken"
|
||||
}
|
||||
|
||||
DownloadAndInstall -Name 'MSMPI' -Url $MpiUrl -Args @('-force', '-unattend')
|
||||
DownloadAndInstall -Name 'MSMPI' -LocalName 'msmpisetup.exe' -Url $MpiUrl -Args @('-force', '-unattend')
|
||||
|
||||
@@ -8,8 +8,8 @@ if (Test-Path "$PSScriptRoot/utility-prefix.ps1") {
|
||||
}
|
||||
|
||||
# See https://learn.microsoft.com/visualstudio/releases/2022/release-history
|
||||
# 17.14.22
|
||||
$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/4f894be7-d4f2-4679-ace9-52a83030dab5/97fee98291f2a7970f5e6e7748a59378a59ef4a9837765e15cc6e84f5eec3d94/vs_Enterprise.exe'
|
||||
# 17.14.24
|
||||
$VisualStudioBootstrapperUrl = 'https://download.visualstudio.microsoft.com/download/pr/6a6c3c0f-51bf-4bfb-a89c-59f6e85932b3/8908e6b6ae03b014125ba05ce9746a2750126d1715d88ca269ca01a2b62cec7a/vs_Enterprise.exe'
|
||||
$Workloads = @(
|
||||
'Microsoft.VisualStudio.Workload.NativeDesktop',
|
||||
'Microsoft.VisualStudio.Workload.Universal',
|
||||
|
||||
@@ -398,61 +398,61 @@
|
||||
"name": "azcopy",
|
||||
"os": "linux",
|
||||
"arch": "amd64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_linux_amd64_10.31.0/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_linux_amd64_10.31.0.tar.gz",
|
||||
"sha512": "ea38174f1bbdf37e5d8e0fb4d3dccde447b83b0438b14d42ac9c47d8880a3567b8cb94b1debc6846d200f7fbd63bb9be50a7d6a43ae6092e4dfe299ac9fa8de8",
|
||||
"archive": "azcopy_linux_amd64_10.31.0.tar.gz"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_linux_amd64_10.31.1/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_linux_amd64_10.31.1.tar.gz",
|
||||
"sha512": "87de37caec3e52ce23840e75d11f3c0b0312a661939d6a3d7175e4e42733f5d8451d0925706d0b992bb8c401e7c128d8a63ccb16c05722d50abcd301a28a8a35",
|
||||
"archive": "azcopy_linux_amd64_10.31.1.tar.gz"
|
||||
},
|
||||
{
|
||||
"name": "azcopy",
|
||||
"os": "linux",
|
||||
"arch": "arm64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_linux_arm64_10.31.0/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_linux_arm64_10.31.0.tar.gz",
|
||||
"sha512": "4f519ba08ac26d88a350558f760e82bed782d1cf4438be1ddcbec6ba5ff576a772ce304e970a2e8ef2450994927ab4af0bbd1c264cd6ddd39dc058d9998309e3",
|
||||
"archive": "azcopy_linux_arm64_10.31.0.tar.gz"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_linux_arm64_10.31.1/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_linux_arm64_10.31.1.tar.gz",
|
||||
"sha512": "e79777c346b990cb15ac6cefc21ef2b7bab2f454bd6df056e68043648048036f453914c4cd4d4ba66af8cbe2b9f2e45ed19feb3bd1bfaa6760fffbfb7b1b038a",
|
||||
"archive": "azcopy_linux_arm64_10.31.1.tar.gz"
|
||||
},
|
||||
{
|
||||
"name": "azcopy",
|
||||
"os": "osx",
|
||||
"arch": "amd64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_darwin_amd64_10.31.0/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_darwin_amd64_10.31.0.zip",
|
||||
"sha512": "f6f61315735d6df86e83766638fd1fe21e83ecd8c58ccdc8fadb52f62f72f07e0bb89ae9fe4b98d173529559654800e7e500d381a34cd7917812a1d1c0e8dc7d",
|
||||
"archive": "azcopy_darwin_amd64_10.31.0.zip"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_darwin_amd64_10.31.1/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_darwin_amd64_10.31.1.zip",
|
||||
"sha512": "ffc0f58475bf7095094084257aa2bfb38b8d7b58615da13d297ddec215e88c29a367f942008de5fc3339ba2c37b93d7164b9d7ee32b6d8b9e6dfc574372b0561",
|
||||
"archive": "azcopy_darwin_amd64_10.31.1.zip"
|
||||
},
|
||||
{
|
||||
"name": "azcopy",
|
||||
"os": "osx",
|
||||
"arch": "arm64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_darwin_arm64_10.31.0/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_darwin_arm64_10.31.0.zip",
|
||||
"sha512": "be320020701886ff1c77c9e7d5bf4bce15971b606dca02adad795f8421cfb9ee5790515e1754e7ef60435626b7f55595fdbebe5c63774b7b239a142af8bdfdcb",
|
||||
"archive": "azcopy_darwin_arm64_10.31.0.zip"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_darwin_arm64_10.31.1/azcopy",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_darwin_arm64_10.31.1.zip",
|
||||
"sha512": "7c37e1b767c195e8b7bf27e6b52ac3fc583b77db015cc95bf49c59e43bd3ff264498103649c78475aff9ae7b8dc4441b6e8ee5872a195d12fc4909a24a811101",
|
||||
"archive": "azcopy_darwin_arm64_10.31.1.zip"
|
||||
},
|
||||
{
|
||||
"name": "azcopy",
|
||||
"os": "windows",
|
||||
"arch": "amd64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_windows_amd64_10.31.0/azcopy.exe",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_windows_amd64_10.31.0.zip",
|
||||
"sha512": "540f74612af166fe155fd8d6d22999e4242b4cf3c3e3fe81403d8f7f58a8a418f9279391b33be31a5848e9dbd99a62b307f7a154da96ee7419bbe7b918e1df35",
|
||||
"archive": "azcopy_windows_amd64_10.31.0.zip"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_windows_amd64_10.31.1/azcopy.exe",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_windows_amd64_10.31.1.zip",
|
||||
"sha512": "bf2aca121a60c3267967e1a740520c2bd67fb4c26411347f7ae8071bfb0bdab2dd9ad5a301893a12ce0245ac1b4b655412dfb7b9217528b0da767021d2b19ede",
|
||||
"archive": "azcopy_windows_amd64_10.31.1.zip"
|
||||
},
|
||||
{
|
||||
"name": "azcopy",
|
||||
"os": "windows",
|
||||
"arch": "arm64",
|
||||
"version": "10.31.0",
|
||||
"executable": "azcopy_windows_arm64_10.31.0/azcopy.exe",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.0/azcopy_windows_arm64_10.31.0.zip",
|
||||
"sha512": "a426c43244adc6e39efb422a73faaad2a8d93d3805d2d4e3bd3f011daf491871366f371936c68da184596167a2b8de746dd8f9276aa30996b23e4b51f9f56da4",
|
||||
"archive": "azcopy_windows_arm64_10.31.0.zip"
|
||||
"version": "10.31.1",
|
||||
"executable": "azcopy_windows_arm64_10.31.1/azcopy.exe",
|
||||
"url": "https://github.com/Azure/azure-storage-azcopy/releases/download/v10.31.1/azcopy_windows_arm64_10.31.1.zip",
|
||||
"sha512": "2f267aa119544ffab5ae0f79ea2431631a8c2e927a0a74113b7c2974f28728316777770fa950ec6243267b483c3cecdab97b2343c022f5f21020f1d5e824a448",
|
||||
"archive": "azcopy_windows_arm64_10.31.1.zip"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
@@ -6621,8 +6621,8 @@
|
||||
"port-version": 5
|
||||
},
|
||||
"msmpi": {
|
||||
"baseline": "10.1.12498",
|
||||
"port-version": 5
|
||||
"baseline": "10.1.12498.52",
|
||||
"port-version": 0
|
||||
},
|
||||
"msquic": {
|
||||
"baseline": "2.4.8",
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "4c1c19f1b6fdd52377514345fb5ebbc9c3e3280e",
|
||||
"version": "10.1.12498.52",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "725c5656745976dabcf479bc5cd0d587a24fe050",
|
||||
"version": "10.1.12498",
|
||||
|
||||
Reference in New Issue
Block a user