aboutsummaryrefslogtreecommitdiff
path: root/scripts/bootstrap.sh
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-06-22 19:16:04 -0700
committerGitHub <noreply@github.com>2021-06-22 19:16:04 -0700
commit2ed44b4546ecc764c81db4fd16ea19d19ea0449d (patch)
tree62bddef170709b99b5ed4d8ed7455bc1f5c7a1ad /scripts/bootstrap.sh
parent08690d82c11eaea801c103238cc2e948b1a60eb5 (diff)
downloadvcpkg-2ed44b4546ecc764c81db4fd16ea19d19ea0449d.tar.gz
vcpkg-2ed44b4546ecc764c81db4fd16ea19d19ea0449d.zip
Update VMs and pick up VS2019 16.10 (#18233)
* Cherry-pick https://github.com/microsoft/vcpkg/pull/15598 * Hook deploy-inteloneapi into create-vmss.ps1. * Add script to resolve https://github.com/microsoft/vcpkg/issues/17521 * Move tls settings deployment to the front and respond to script triggering a reboot. * Go back to provisioning an extra disk to workaround https://github.com/microsoft/vcpkg/issues/18379 * Disallow public access to blob storage and require TLS 1.2. * Update Pools. * Update tool to 2021-06-19 * [simage] Skip simage on uwp platforms as it appears broken by 16.10. * [tensorflow-cc] Skip because changes in our MacOS hardware broke the port.
Diffstat (limited to 'scripts/bootstrap.sh')
-rw-r--r--scripts/bootstrap.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 9a97751d6..4ee1c11eb 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -278,8 +278,8 @@ else
fi
# Do the build
-vcpkgToolReleaseTag="2021-05-05-9f849c4c43e50d1b16186ae76681c27b0c1be9d9"
-vcpkgToolReleaseSha="2b85eb0da65221d207a5023eda0d4da74258d7fb5db9e211718efb2573673daa3fa98a75af4a570595f12467a8f7e7759a3be01b33598a4fb6d4203bf83949ef"
+vcpkgToolReleaseTag="2021-06-19"
+vcpkgToolReleaseSha="e9626023b5b545ac88985a0b1bec2d1784f2c5724cc23c6dacf7bf5851c1c7b34649d11192bcd20e41a6340dc6a8d557cace20016a0e121cc8975613f11343ef"
vcpkgToolReleaseTarball="$vcpkgToolReleaseTag.tar.gz"
vcpkgToolUrl="https://github.com/microsoft/vcpkg-tool/archive/$vcpkgToolReleaseTarball"
baseBuildDir="$vcpkgRootDir/buildtrees/_vcpkg"