From 4b94d6ffdedf4d4a653f9cd9ecfabb4d5d88096f Mon Sep 17 00:00:00 2001
From: Billy Robert ONeal III <bion@microsoft.com>
Date: Tue, 29 Jun 2021 13:15:07 -0700
Subject: [PATCH 1/2] Update vcpkg tool to resolve leak of the asset cache
 token, and update to a current asset cache.

---
 scripts/azure-pipelines/linux/azure-pipelines.yml   | 4 ++--
 scripts/azure-pipelines/osx/azure-pipelines.yml     | 3 ++-
 scripts/azure-pipelines/windows/azure-pipelines.yml | 4 ++--
 scripts/bootstrap.ps1                               | 2 +-
 scripts/bootstrap.sh                                | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/scripts/azure-pipelines/linux/azure-pipelines.yml b/scripts/azure-pipelines/linux/azure-pipelines.yml
index 83ef7e27c30408..0c126d886c65b2 100644
--- a/scripts/azure-pipelines/linux/azure-pipelines.yml
+++ b/scripts/azure-pipelines/linux/azure-pipelines.yml
@@ -14,9 +14,9 @@ jobs:
     value: /mnt/vcpkg-ci
   - name: VCPKG_DOWNLOADS
     value: /mnt/vcpkg-ci/downloads
-  - group: azblob-test-sas-group
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - bash: df -h
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 19612c3cc88ecc..2e9f05d6379dcd 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -17,8 +17,9 @@ jobs:
   - group: osx-2021-04-16
   - name: BINARY_SOURCE_STUB
     value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - bash: df -h
diff --git a/scripts/azure-pipelines/windows/azure-pipelines.yml b/scripts/azure-pipelines/windows/azure-pipelines.yml
index a822888ab7afee..ed5a0a405040bf 100644
--- a/scripts/azure-pipelines/windows/azure-pipelines.yml
+++ b/scripts/azure-pipelines/windows/azure-pipelines.yml
@@ -14,9 +14,9 @@ jobs:
     value: D:\
   - name: VCPKG_DOWNLOADS
     value: D:\downloads
-  - group: azblob-test-sas-group
+  - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
-    value: "x-azurl,$(azblob-root-url),$(azblob-test-sas),readwrite"
+    value: "x-azurl,$(root-url),$(sas),readwrite"
 
   steps:
   - task: PowerShell@2
diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index 37cab340fbeb02..bcc4b37a68f49c 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-19/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
+& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-26/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 Write-Host ""
 
 if ($LASTEXITCODE -ne 0)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 4ee1c11eb6194a..7f4a945b84de95 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -278,8 +278,8 @@ else
 fi
 
 # Do the build
-vcpkgToolReleaseTag="2021-06-19"
-vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef"
+vcpkgToolReleaseTag="2021-06-26"
+vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b"
 vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
 baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"

From ade5d5eda53299053e0576c4167ee65162f485e7 Mon Sep 17 00:00:00 2001
From: Billy Robert ONeal III <bion@microsoft.com>
Date: Tue, 29 Jun 2021 13:33:49 -0700
Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A4=A6=E2=80=8D=E2=99=82=EF=B8=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/bootstrap.ps1 | 2 +-
 scripts/bootstrap.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bootstrap.ps1 b/scripts/bootstrap.ps1
index bcc4b37a68f49c..6ffcddddcecf21 100644
--- a/scripts/bootstrap.ps1
+++ b/scripts/bootstrap.ps1
@@ -45,7 +45,7 @@ while (!($vcpkgRootDir -eq "") -and !(Test-Path "$vcpkgRootDir\.vcpkg-root"))
 
 Write-Verbose "Examining $vcpkgRootDir for .vcpkg-root - Found"
 
-& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-26/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
+& "$scriptsDir/tls12-download.exe" github.com "/microsoft/vcpkg-tool/releases/download/2021-06-29/vcpkg.exe" "$vcpkgRootDir\vcpkg.exe"
 Write-Host ""
 
 if ($LASTEXITCODE -ne 0)
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 7f4a945b84de95..0c612cff2af07e 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -278,7 +278,7 @@ else
 fi
 
 # Do the build
-vcpkgToolReleaseTag="2021-06-26"
+vcpkgToolReleaseTag="2021-06-29"
 vcpkgToolReleaseSha="ffaa649cdb996946deff538ed0df192dffff41eb838179566aa77f91cdaaeadea7cd058bb4b230057f4b14703fbcd3c557b398ec7388d94177d3fc31073e7b6b"
 vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
 vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"