From d0d2b9239f3153667e0d9e6ceca15f1b291a84b6 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Mon, 4 Jul 2022 14:35:52 +0400
Subject: [PATCH] Add vagrant to macOS-12 (#5854)

---
 images/macos/software-report/SoftwareReport.Generator.ps1 | 2 +-
 images/macos/tests/BasicTools.Tests.ps1                   | 2 +-
 images/macos/toolsets/toolset-12.json                     | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index df8fe824d..199635d4f 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -135,13 +135,13 @@ if ($os.IsLessThanMonterey) {
 
 if ($os.IsCatalina) {
     $utilitiesList += @(
-        (Get-VagrantVersion),
         (Get-ParallelVersion)
     )
 }
 
 if (-not $os.IsBigSur) {
     $utilitiesList += @(
+        (Get-VagrantVersion),
         (Get-VirtualBoxVersion)
     )
 }
diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1
index 8bfa45aea..df7045b50 100644
--- a/images/macos/tests/BasicTools.Tests.ps1
+++ b/images/macos/tests/BasicTools.Tests.ps1
@@ -138,7 +138,7 @@ Describe "wget" {
     }
 }
 
-Describe "vagrant" -Skip:($os.IsHigherThanCatalina) {
+Describe "vagrant" -Skip:($os.IsBigSur) {
     It "vagrant" {
         "vagrant --version" | Should -ReturnZeroExitCode
     }
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index c1b7c80e5..b0bcdf3b2 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -161,6 +161,7 @@
         ],
         "cask_packages": [
             "julia",
+            "vagrant",
             "virtualbox"
         ]
     },