From 9afa48555680e8976bc80f481a39704e3978c2d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jun 2026 08:33:21 +0000 Subject: [PATCH 1/7] Bump github.com/microsoft/vcpkg from master to 2026.06.01 Bumps [github.com/microsoft/vcpkg](https://github.com/microsoft/vcpkg) from master to 2026.06.01. This release includes the previously tagged commit. - [Release notes](https://github.com/microsoft/vcpkg/releases) - [Commits](https://github.com/microsoft/vcpkg/compare/80f9bcfa455e875d9c1bf7a7c6692d7e1e481061...f3e10653cc27d62a37a3763cd84b38bca07c6075) --- updated-dependencies: - dependency-name: github.com/microsoft/vcpkg dependency-version: 2026.06.01 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 460e8ed160..84da163b7b 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "80f9bcfa455e875d9c1bf7a7c6692d7e1e481061", + "builtin-baseline": "f3e10653cc27d62a37a3763cd84b38bca07c6075", "dependencies": [ { "name": "curl" From 95467be5e6de9aea6f7a21b002b3b6ad852944ce Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Fri, 5 Jun 2026 13:05:52 -0700 Subject: [PATCH 2/7] Update default VCPKG commit string --- cmake-modules/AzureVcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index aa80f14751..7c058d41a3 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING 80f9bcfa455e875d9c1bf7a7c6692d7e1e481061) # default SDK tested commit + set(VCPKG_COMMIT_STRING f3e10653cc27d62a37a3763cd84b38bca07c6075) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit From 7dec31b08059e4a361c8e08a819557cd94cda24c Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Thu, 9 Jul 2026 14:55:18 -0700 Subject: [PATCH 3/7] Update default VCPKG commit string --- cmake-modules/AzureVcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 7c058d41a3..11380095ca 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING f3e10653cc27d62a37a3763cd84b38bca07c6075) # default SDK tested commit + set(VCPKG_COMMIT_STRING cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit From 8a7607e93e315cb4e09cb17e23af5ef1551e8b69 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Thu, 9 Jul 2026 14:55:35 -0700 Subject: [PATCH 4/7] Update builtin-baseline version in vcpkg.json --- vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vcpkg.json b/vcpkg.json index 84da163b7b..0e1b091745 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "f3e10653cc27d62a37a3763cd84b38bca07c6075", + "builtin-baseline": "cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3", "dependencies": [ { "name": "curl" @@ -46,4 +46,4 @@ } ], "overrides": [] -} \ No newline at end of file +} From ab6d128787834efdcde959b1276a8f52c4301ee9 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Wed, 5 Aug 2026 12:29:51 -0700 Subject: [PATCH 5/7] Update default VCPKG commit string --- cmake-modules/AzureVcpkg.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake-modules/AzureVcpkg.cmake b/cmake-modules/AzureVcpkg.cmake index 11380095ca..58313d8a28 100644 --- a/cmake-modules/AzureVcpkg.cmake +++ b/cmake-modules/AzureVcpkg.cmake @@ -18,7 +18,7 @@ macro(az_vcpkg_integrate) message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.") # GET VCPKG FROM SOURCE # User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch - set(VCPKG_COMMIT_STRING cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3) # default SDK tested commit + set(VCPKG_COMMIT_STRING 9e593bb18ea69cc5095e012465dcd675a822ed0d) # default SDK tested commit if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT}) message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.") set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit From 3c7046433aa29c273131973972d4a79aceccf226 Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Date: Wed, 5 Aug 2026 12:30:09 -0700 Subject: [PATCH 6/7] Update builtin-baseline version in vcpkg.json --- vcpkg.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcpkg.json b/vcpkg.json index 0e1b091745..f2e67d436c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "azure-sdk-for-cpp", "version": "1.5.0", - "builtin-baseline": "cd61e1e26a038e82d6550a3ebbe0fbbfe7da78e3", + "builtin-baseline": "9e593bb18ea69cc5095e012465dcd675a822ed0d", "dependencies": [ { "name": "curl" From aa299e8df2f334dd8cdb9b4eb33f62d8ed84bbec Mon Sep 17 00:00:00 2001 From: Anton Kolesnyk Date: Wed, 5 Aug 2026 16:25:42 -0700 Subject: [PATCH 7/7] Proactively run with future changes to eng to enable Terrapin - will be rolled back from this PR later --- .../pipelines/templates/steps/set-vcpkg-cache-vars.yml | 5 +++-- eng/common/scripts/Set-VcpkgWriteModeCache.ps1 | 1 - eng/pipelines/templates/steps/cmake-build.yml | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/eng/common/pipelines/templates/steps/set-vcpkg-cache-vars.yml b/eng/common/pipelines/templates/steps/set-vcpkg-cache-vars.yml index c7ece396e0..7827494c5c 100644 --- a/eng/common/pipelines/templates/steps/set-vcpkg-cache-vars.yml +++ b/eng/common/pipelines/templates/steps/set-vcpkg-cache-vars.yml @@ -6,9 +6,10 @@ parameters: steps: - pwsh: | - Write-Host "Setting vcpkg cache variables for read only access to vcpkg binary and asset caches" + Write-Host "Setting vcpkg cache variables for read only access to the vcpkg binary cache" Write-Host '##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azcopy,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,read' - Write-Host '##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read' + Write-Host "Setting Terrapin asset source for read only access to the vcpkg source mirror" + Write-Host '##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES]clear;x-azurl,https://vcpkg.storage.devpackages.microsoft.io/artifacts/;x-block-origin' displayName: Set vcpkg variables - ${{if eq(variables['System.TeamProject'], 'internal') }}: diff --git a/eng/common/scripts/Set-VcpkgWriteModeCache.ps1 b/eng/common/scripts/Set-VcpkgWriteModeCache.ps1 index 37bca90019..27bdef477d 100755 --- a/eng/common/scripts/Set-VcpkgWriteModeCache.ps1 +++ b/eng/common/scripts/Set-VcpkgWriteModeCache.ps1 @@ -20,4 +20,3 @@ Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SAS_TOKEN;issecret=true Write-Host "Setting vcpkg binary cache to read and write" Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azcopy-sas,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite" -Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite" diff --git a/eng/pipelines/templates/steps/cmake-build.yml b/eng/pipelines/templates/steps/cmake-build.yml index 38f1dac72c..b58d7da0ea 100644 --- a/eng/pipelines/templates/steps/cmake-build.yml +++ b/eng/pipelines/templates/steps/cmake-build.yml @@ -49,7 +49,6 @@ steps: displayName: cmake generate env: VCPKG_BINARY_SOURCES: $(VCPKG_BINARY_SOURCES_SECRET) - X_VCPKG_ASSET_SOURCES: $(X_VCPKG_ASSET_SOURCES_SECRET) # Core should build all cmake targets - ${{ if and(eq(parameters.Build, true), eq(parameters.ServiceDirectory, 'core')) }}: