From b3ddd57d493bcde6146dc262cd2b492d6dbf1825 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Mon, 20 Nov 2023 14:47:33 +0100
Subject: [PATCH] [macOS] Add xcodes and xcbeautify to macOS images (#8835)

---
 .../macos/scripts/docs-gen/SoftwareReport.Common.psm1  | 10 ++++++++++
 .../scripts/docs-gen/SoftwareReport.Generator.ps1      |  6 ++++++
 images/macos/toolsets/toolset-12.json                  |  4 +++-
 images/macos/toolsets/toolset-13.json                  |  4 +++-
 images/macos/toolsets/toolset-14.json                  |  4 +++-
 5 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
index 29d2e9db..79e26839 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Common.psm1
+++ b/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
+}
diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1 b/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1
index b6825864..3872575f 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Generator.ps1
+++ b/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")
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 48764550..b1cf785c 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -206,7 +206,9 @@
             "r",
             "yq",
             "imagemagick",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia",
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 82fad829..bf3c2c59 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -74,7 +74,9 @@
             "gmp",
             "r",
             "yq",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia"
diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json
index a45ccf5c..81b5b0dc 100644
--- a/images/macos/toolsets/toolset-14.json
+++ b/images/macos/toolsets/toolset-14.json
@@ -70,7 +70,9 @@
             "gmp",
             "r",
             "yq",
-            "unxip"
+            "unxip",
+            "xcbeautify",
+            "xcodes"
         ],
         "cask_packages": [
             "julia"