6 files changed, 20 insertions, 18 deletions
diff --git a/scripts/azure-pipelines/azure-pipelines.yml b/scripts/azure-pipelines/azure-pipelines.yml
index 3d89b3793..9b509ea1f 100644
--- a/scripts/azure-pipelines/azure-pipelines.yml
+++ b/scripts/azure-pipelines/azure-pipelines.yml
@@ -4,7 +4,7 @@
 variables:
   windows-pool: 'PrWin-2021-07-14'
   linux-pool: 'PrLin-2021-07-14'
-  osx-pool: 'PrOsx-2021-04-16'
+  osx-pool: 'PrOsx-2021-07-27'
 
 stages:
 - stage: FormatChecks
diff --git a/scripts/azure-pipelines/osx/README.md b/scripts/azure-pipelines/osx/README.md
index 9f253a06c..9d6fb40b7 100644
--- a/scripts/azure-pipelines/osx/README.md
+++ b/scripts/azure-pipelines/osx/README.md
@@ -155,18 +155,18 @@ Run the following commands:
 ```sh
 $ cd ~/Parallels
 $ echo '{ "provider": "parallels" }' >metadata.json
-$ tar zgvf <current date>.box ./metadata.json ./<name of VM>.pvm
+$ tar zcvf <macos version>.box ./metadata.json ./<name of VM>.pvm
 ```
 
 This will create a box file which contains all the necessary data.
 You can delete the `metadata.json` file after.
 
 Once you've done that, you can upload it to the fileshare,
-under `share/boxes/vcpkg-ci-base`, add it to `share/boxes/vcpkg-ci-base.json`,
+under `share/boxes/macos-base`, add it to `share/boxes/macos-base.json`,
 and finally add it to vagrant:
 
 ```sh
-$ vagrant box add ~/vagrant/share/boxes/vcpkg-ci-base.json
+$ vagrant box add ~/vagrant/share/boxes/macos-base.json
 ```
 
 Then, we'll create the final box,
@@ -184,9 +184,9 @@ $ vagrant package
 
 This will create a `package.box`, which is the box file for the base VM.
 Once you've created this box, if you're making it the new box for the CI,
-upload it to the fileshare, under `share/boxes/vcpkg-ci`.
+upload it to the fileshare, under `share/boxes/macos-ci`.
 Then, add the metadata about the box (the name and version) to
-`share/boxes/vcpkg-ci.json`.
+`share/boxes/macos-ci.json`.
 Once you've done that, add the software versions under [VM Software Versions](#vm-software-versions).
 
 [base-box-instructions]: https://parallels.github.io/vagrant-parallels/docs/boxes/base.html
@@ -199,6 +199,9 @@ Once you've done that, add the software versions under [VM Software Versions](#v
 * 2021-04-16:
   * macOS: 11.2.3
   * Xcode CLTs: 12.4
+* 2021-07-27:
+  * macOS: 11.5.1
+  * Xcode CLTs: 12.5.1
 
 ### (Internal) Accessing the macOS fileshare
 
diff --git a/scripts/azure-pipelines/osx/Utilities.psm1 b/scripts/azure-pipelines/osx/Utilities.psm1
index 1b70d61f7..620ec7f4b 100644
--- a/scripts/azure-pipelines/osx/Utilities.psm1
+++ b/scripts/azure-pipelines/osx/Utilities.psm1
@@ -79,7 +79,7 @@ function Get-RemoteFile
     if ($actualHash.Hash -ne $Sha256) {
         throw @"
 Invalid hash for file $OutFile;
-    expected: $Hash
+    expected: $Sha256
     found:    $($actualHash.Hash)
 Please make sure that the hash in the powershell file is correct.
 "@
diff --git a/scripts/azure-pipelines/osx/azure-pipelines.yml b/scripts/azure-pipelines/osx/azure-pipelines.yml
index 38eb7fa7b..154247da4 100644
--- a/scripts/azure-pipelines/osx/azure-pipelines.yml
+++ b/scripts/azure-pipelines/osx/azure-pipelines.yml
@@ -14,9 +14,9 @@ jobs:
     value: /Users/vagrant/Data
   - name: VCPKG_DOWNLOADS
     value: /Users/vagrant/Data/downloads
-  - group: osx-2021-04-16
+  - group: osx-binary-caching-credentials
   - name: BINARY_SOURCE_STUB
-    value: "x-azblob,$(azblob-root-url),$(azblob-test-sas)"
+    value: "x-azblob,$(root-url),$(sas)"
   - group: vcpkg-asset-caching-credentials
   - name: X_VCPKG_ASSET_SOURCES
     value: "x-azurl,$(root-url),$(sas),readwrite"
diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb b/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb
index 90ad6c4c5..cbe76a720 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile-box.rb
@@ -3,8 +3,7 @@ require 'json'
 configuration = JSON.parse(File.read("#{__dir__}/vagrant-box-configuration.json"))
 
 Vagrant.configure('2') do |config|
-  config.vm.box = 'vcpkg/macos-ci-base'
-  config.vm.box_version = configuration['box_version']
+  config.vm.box = 'vcpkg/macos-base'
   config.vm.synced_folder '.', '/Users/vagrant/shared'
 
   config.vm.provision 'shell',
diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json
index 1b2c2d015..179b03f15 100644
--- a/scripts/azure-pipelines/osx/configuration/installables.json
+++ b/scripts/azure-pipelines/osx/configuration/installables.json
@@ -6,18 +6,18 @@
       "Name": "vagrant",
       "VersionCommand": [ "vagrant", "-v" ],
       "VersionRegex": "Vagrant (.*)",
-      "Version": "2.2.15",
-      "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.15/vagrant_2.2.15_x86_64.dmg",
-      "Sha256": "5C2B290C4FA2371E255C56B1E96DED3D0C838D54CB7F0E8E6CF154E9F206A20E",
+      "Version": "2.2.18",
+      "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.18/vagrant_2.2.18_x86_64.dmg",
+      "Sha256": "B4E8103AABDF29F18F592CD6DE4FA03BF182FBC192A0757B5E18156CB18FA672",
       "InstallerPath": "vagrant.pkg"
     },
     {
       "Name": "osxfuse",
       "VersionCommand": [ "cat", "/Library/Filesystems/macfuse.fs/Contents/version.plist" ],
       "VersionRegex": "<key>CFBundleVersion</key>[\\n\\t ]*<string>([0-9.]+)</string>",
-      "Version": "4.1.0",
-      "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.0/macfuse-4.1.0.dmg",
-      "Sha256": "3CB6A49406FD036C50EF1B4AD717A377F4DCF182811BDE172D69F1C289791085",
+      "Version": "4.1.2",
+      "DmgUrl": "https://github.com/osxfuse/osxfuse/releases/download/macfuse-4.1.2/macfuse-4.1.2.dmg",
+      "Sha256": "9FF344DE38BAD5AC5ECA5194DA00A2BA35DD6AFDB9039133B5446168F8EDAFDB",
       "InstallerPath": "Install macFUSE.pkg"
     },
     {
@@ -34,7 +34,7 @@
   "VagrantPlugins": [
     {
       "Name": "vagrant-parallels",
-      "Version": "2.2.1"
+      "Version": "2.2.3"
     }
   ]
 }