[macOS] Add xcodes and xcbeautify to macOS images (#8835)

images/macos/scripts/docs-gen/SoftwareReport.Common.psm1

@@ -626,3 +626,13 @@ function Get-PKGConfigVersion {
     $pkgconfigVersion = Run-Command "pkg-config --version"
     return $pkgconfigVersion
 }
+
+function Get-XcbeautifyVersion {
+    $XcbeautifyVersion = Run-Command "xcbeautify --version"
+    return $XcbeautifyVersion
+}
+
+function Get-XcodesVersion {
+    $XcodesVersion = Run-Command "xcodes version"
+    return $XcodesVersion
+}

images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1

@@ -185,7 +185,13 @@ $tools.AddToolVersion("SwiftFormat", $(Get-SwiftFormatVersion))
 if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
     $tools.AddToolVersion("Swig", $(Get-SwigVersion))
 }
+if (-not $os.IsBigSur) {
+    $tools.AddToolVersion("Xcbeautify", $(Get-XcbeautifyVersion))
+}
 $tools.AddToolVersion("Xcode Command Line Tools", $(Get-XcodeCommandLineToolsVersion))
+if (-not $os.IsBigSur) {
+    $tools.AddToolVersion("Xcodes", $(Get-XcodesVersion))
+}
 
 # Linters
 $linters = $installedSoftware.AddHeader("Linters")

images/macos/toolsets/toolset-12.json

@@ -206,7 +206,9 @@
             "r",
             "yq",
             "imagemagick",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia",

images/macos/toolsets/toolset-13.json

@@ -74,7 +74,9 @@
             "gmp",
             "r",
             "yq",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia"

images/macos/toolsets/toolset-14.json

@@ -70,7 +70,9 @@
             "gmp",
             "r",
             "yq",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia"