[MacOS] Add software to MacOS 12 image was not available during the Monterey beta stage. (#4644)

images/macos/software-report/SoftwareReport.Generator.ps1

@@ -43,21 +43,16 @@ $languageAndRuntimeList = @(
     (Get-DotnetVersionList),
     (Get-GoVersion),
     (Get-JuliaVersion),
-    (Get-KotlinVersion)
+    (Get-KotlinVersion),
+    (Get-PHPVersion),
+    (Get-ClangLLVMVersion)
 )
 
 if ($os.IsLessThanMonterey) {
     $languageAndRuntimeList += @(
-        (Get-PHPVersion)
+        (Get-GccVersion),
-    )
-}
-
-if ($os.IsLessThanMonterey) {
-    $languageAndRuntimeList += @(
-        (Get-GccVersion)
         (Get-FortranVersion)
-        (Get-ClangLLVMVersion)
+   )
-    )
 }
 
 if ($os.IsLessThanBigSur) {
@@ -83,17 +78,17 @@ $packageManagementList = @(
     (Get-YarnVersion),
     (Get-NuGetVersion),
     (Get-RubyGemsVersion),
-    (Get-ComposerVersion)
+    (Get-ComposerVersion),
+    (Get-CarthageVersion)
 )
 
 if ($os.IsLessThanMonterey) {
     $packageManagementList += @(
-        (Get-CarthageVersion),
         (Get-CondaVersion)
     )
 }
 
-if ($os.IsHigherThanMojave -and $os.IsLessThanMonterey) {
+if ($os.IsHigherThanMojave) {
     $packageManagementList += @(
         (Get-VcpkgVersion)
     )
@@ -139,12 +134,14 @@ $utilitiesList = @(
     (Get-MongodVersion),
     (Get-7zipVersion),
     (Get-BsdtarVersion),
-    (Get-GnuTarVersion)
+    (Get-GnuTarVersion),
+    (Get-GPGVersion),
+    (Get-SwitchAudioOsxVersion),
+    (Get-SoxVersion)
 )
 
 if ($os.IsLessThanMonterey) {
     $utilitiesList += @(
-        (Get-GPGVersion),
         (Get-HelmVersion)
     )
 }
@@ -163,13 +160,6 @@ if ($os.IsLessThanBigSur) {
     )
 }
 
-if ($os.IsLessThanMonterey) {
-    $utilitiesList += @(
-        (Get-SwitchAudioOsxVersion),
-        (Get-SoxVersion)
-    )
-}
-
 $markdown += New-MDList -Style Unordered -Lines ($utilitiesList | Sort-Object)
 
 # Tools

images/macos/templates/macOS-12.json

@@ -165,9 +165,11 @@
             "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
             "scripts": [
                 "./provision/core/commonutils.sh",
+                "./provision/core/llvm.sh",
                 "./provision/core/golang.sh",
                 "./provision/core/swiftlint.sh",
                 "./provision/core/openjdk.sh",
+                "./provision/core/php.sh",
                 "./provision/core/aws.sh",
                 "./provision/core/rust.sh",
                 "./provision/core/haskell.sh",
@@ -181,6 +183,8 @@
                 "./provision/core/nginx.sh",
                 "./provision/core/postgresql.sh",
                 "./provision/core/mongodb.sh",
+                "./provision/core/audiodevice.sh",
+                "./provision/core/vcpkg.sh",
                 "./provision/core/safari.sh",
                 "./provision/core/chrome.sh",
                 "./provision/core/edge.sh",

images/macos/tests/BasicTools.Tests.ps1

@@ -6,7 +6,7 @@ Describe "Azure CLI" {
     }
 }
 
-Describe "Carthage" -Skip:($os.IsMonterey) {
+Describe "Carthage" {
     It "Carthage" {
         "carthage version" | Should -ReturnZeroExitCode
     }
@@ -30,7 +30,7 @@ Describe "SwiftFormat" -Skip:($os.IsMonterey) {
     }
 }
 
-Describe "GnuPG" -Skip:($os.IsMonterey) {
+Describe "GnuPG" {
     It "GnuPG" {
         "gpg --version" | Should -ReturnZeroExitCode
     }

images/macos/tests/Common.Tests.ps1

@@ -33,7 +33,7 @@ Describe "GCC" -Skip:($os.IsMonterey) {
     }
 }
 
-Describe "vcpkg" -Skip:($os.IsMojave -or $os.IsMonterey) {
+Describe "vcpkg" -Skip:($os.IsMojave) {
     It "vcpkg" {
         "vcpkg version" | Should -ReturnZeroExitCode
     }

images/macos/tests/LLVM.Tests.ps1

@@ -1,6 +1,6 @@
 $os = Get-OSVersion
 
-Describe "Clang/LLVM" -Skip:($os.IsMonterey) {
+Describe "Clang/LLVM" {
     It "Clang/LLVM is installed and version is correct" {
         $toolsetVersion = Get-ToolsetValue 'llvm.version'
         $clangVersion = & "$(brew --prefix llvm)/bin/clang" --version

images/macos/tests/PHP.Tests.ps1

@@ -1,6 +1,6 @@
 $os = Get-OSVersion
 
-Describe "PHP" -Skip:($os.IsMonterey) {
+Describe "PHP" {
     Context "PHP" {
         It "PHP Path" {
             Get-WhichTool "php" | Should -Not -BeLike "/usr/bin/php*"

images/macos/tests/RubyGem.Tests.ps1

@@ -19,7 +19,7 @@ Describe "Bundler" {
     }
 }
 
-Describe "Nomad shenzhen CLI" -Skip:($os.IsMonterey) {
+Describe "Nomad shenzhen CLI" {
     It "Nomad shenzhen CLI" {
         "ipa --version" | Should -ReturnZeroExitCode
     }

images/macos/tests/System.Tests.ps1

@@ -17,7 +17,7 @@ Describe "Certificate" {
     }
 }
 
-Describe "Audio device" -Skip:($os.IsMonterey) {
+Describe "Audio device" {
     It "Sox is installed" {
         "sox --version" | Should -ReturnZeroExitCode
     }

images/macos/toolsets/toolset-12.json

@@ -84,8 +84,10 @@
             "aria2",
             "azure-cli",
             "bazelisk",
+            "carthage",
             "cmake",
             "gh",
+            "gnupg",
             "gnu-tar",
             "kotlin",
             "libpq",
@@ -174,6 +176,7 @@
         "rubygems": [
             "xcode-install",
             "cocoapods",
+            "nomad-cli",
             "xcpretty",
             "bundler",
             "fastlane",
@@ -191,6 +194,9 @@
             "16"
         ]
     },
+    "llvm": {
+        "version": "13"
+    },
     "php": {
         "version": "8.1"
     },