Update MacOS Software (#15258)

3 files changed, 14 insertions, 41 deletions

diff --git a/scripts/azure-pipelines/osx/configuration/Vagrantfile b/scripts/azure-pipelines/osx/configuration/Vagrantfile
index c08703777..f5ff39ff3 100644
--- a/scripts/azure-pipelines/osx/configuration/Vagrantfile
+++ b/scripts/azure-pipelines/osx/configuration/Vagrantfile
@@ -18,23 +18,22 @@ brew_formulas = [
   'autoconf',
   'automake',
   'bison',
+  'gfortran',
+  'gperf',
   'libtool',
+  'meson',
   'mono',
+  'nasm',
   'pkg-config',
   'yasm' ]
 
 brew_cask_formulas = [
-  'powershell',
-  'gfortran' ]
+  'powershell' ]
 
-azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.171.1/vsts-agent-osx-x64-2.171.1.tar.gz'
+azure_agent_url = 'https://vstsagentpackage.azureedge.net/agent/2.179.0/vsts-agent-osx-x64-2.179.0.tar.gz'
 devops_url = configuration['devops_url']
 agent_pool = configuration['agent_pool']
 pat = configuration['pat']
-archives = configuration['archives']
-archives_username = archives['username']
-archives_urn = archives['urn']
-archives_path = archives['path']
 
 Vagrant.configure('2') do |config|
   # give them extra time to boot up
@@ -92,19 +91,7 @@ Vagrant.configure('2') do |config|
   config.vm.provision 'shell',
     run: 'once',
     name: 'Install brew applications',
-    inline: "brew install #{brew_formulas.join(' ')} && brew cask install #{brew_cask_formulas.join(' ')}",
-    privileged: false
-
-  config.vm.provision 'shell',
-    run: 'once',
-    name: 'Create archives mountpoint',
-    inline: 'mkdir ~/Data/archives',
-    privileged: false
-
-  config.vm.provision "shell",
-    run: 'once',
-    name: 'Mount archives directory',
-    inline: "sshfs #{archives_username}@#{archives_urn}:#{archives_path} ~/Data/archives",
+    inline: "brew install #{brew_formulas.join(' ')} && brew install --cask #{brew_cask_formulas.join(' ')}",
     privileged: false
 
   config.vm.provision 'shell',
diff --git a/scripts/azure-pipelines/osx/configuration/installables.json b/scripts/azure-pipelines/osx/configuration/installables.json
index 28e24e6a3..7a7ba400c 100644
--- a/scripts/azure-pipelines/osx/configuration/installables.json
+++ b/scripts/azure-pipelines/osx/configuration/installables.json
@@ -5,15 +5,15 @@
     {
       "Name": "VirtualBox",
       "TestCommand": "VBoxManage",
-      "DmgUrl": "https://download.virtualbox.org/virtualbox/6.1.10/VirtualBox-6.1.10-138449-OSX.dmg",
-      "Sha256": "EF0CA4924922514B6AD71469998821F2CF7C596B4B8B59736C3699759E0F1DF8",
+      "DmgUrl": "https://download.virtualbox.org/virtualbox/6.1.16/VirtualBox-6.1.16-140961-OSX.dmg",
+      "Sha256": "D7DF0F05D9A9E7CBA50EA01DA264AC20948B1C9C0E0CCCD2D628085C9F434D45",
       "InstallerPath": "VirtualBox.pkg"
     },
     {
       "Name": "vagrant",
       "TestCommand": "vagrant",
-      "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.9/vagrant_2.2.9_x86_64.dmg",
-      "Sha256": "529CDE2A78E6DF38EC906B65C70B36A087E2601EAB42E25856E35B20CCB027C0",
+      "DmgUrl": "https://releases.hashicorp.com/vagrant/2.2.14/vagrant_2.2.14_x86_64.dmg",
+      "Sha256": "76B849B26E6D6187A7829212B05545D3B424E05F1BCD0F7163DA1E5117084FA6",
       "InstallerPath": "vagrant.pkg"
     }
   ],
@@ -30,8 +30,8 @@
     {
       "Name": "Extension Pack",
       "FullName": "Oracle VM VirtualBox Extension Pack",
-      "Url": "https://download.virtualbox.org/virtualbox/6.1.10/Oracle_VM_VirtualBox_Extension_Pack-6.1.10.vbox-extpack",
-      "Sha256": "03067F27F4DA07C5D0FDAFC56D27E3EA23A60682B333B2A1010FB74EF9A40C28"
+      "Url": "https://download.virtualbox.org/virtualbox/6.1.16/Oracle_VM_VirtualBox_Extension_Pack-6.1.16.vbox-extpack",
+      "Sha256": "9802482B77B95A954CB5111793DA10D009009A4E9A9C4EAA4BD1AE5DAFE9DB46"
     }
   ]
 }
diff --git a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
index 0b1ed2f32..3d6b619e8 100644
--- a/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
+++ b/scripts/azure-pipelines/osx/configuration/vagrant-configuration.schema.json
@@ -7,8 +7,7 @@
     "pat",
     "base_name",
     "disk_size",
-    "machine_identifiers",
-    "archives"
+    "machine_identifiers"
   ],
 
   "properties": {
@@ -32,19 +31,6 @@
     },
     "disk_size": {
       "type": "integer"
-    },
-    "archives": {
-      "type": "object",
-      "required": [
-        "username",
-        "urn",
-        "path"
-      ],
-      "properties": {
-        "username": { "type": "string" },
-        "urn": { "type": "string" },
-        "path": { "type": "string" }
-      }
     }
   }
 }