From a1f7f1a10a4c36abf43293085d57c06176c10e62 Mon Sep 17 00:00:00 2001
From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com>
Date: Thu, 5 Sep 2024 12:19:58 +0200
Subject: [PATCH] [macOS] Software report - Remove redundant info, fix bug with
 empty runtimes for Xcode (#10513)

---
 .../SoftwareReport.Nodes.psm1                 |  2 +-
 .../docs-gen/SoftwareReport.Xcode.psm1        | 23 ++++++++-----------
 images/macos/toolsets/toolset-14.json         |  2 +-
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/helpers/software-report-base/SoftwareReport.Nodes.psm1 b/helpers/software-report-base/SoftwareReport.Nodes.psm1
index 41890927..b77e1c17 100644
--- a/helpers/software-report-base/SoftwareReport.Nodes.psm1
+++ b/helpers/software-report-base/SoftwareReport.Nodes.psm1
@@ -89,7 +89,7 @@ class HeaderNode: BaseNode {
     }
      
     [void] AddTable([PSCustomObject[]] $Table) {
-       $this.AddNode([TableNode]::FromObjectsArray($Table))
+        $this.AddNode([TableNode]::FromObjectsArray($Table))
     }
 
     [void] AddNote([String] $Content) {
diff --git a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1 b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1
index cd03d81c..3384acb8 100644
--- a/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1
+++ b/images/macos/scripts/docs-gen/SoftwareReport.Xcode.psm1
@@ -186,35 +186,30 @@ function Build-XcodeSimulatorsTable {
             $runtimes += $_
         }
     }
-
     $runtimes = $runtimes | Sort-Object @{ Expression = { $_.identifier } } -Unique
-
     return $runtimes | ForEach-Object {
         $runtime = $_
         $runtimeDevices = @()
-        $xcodeList = @()
-
         $xcodeInfo.Values | ForEach-Object {
             $runtimeFound = $_.SimulatorsInfo.runtimes | Where-Object { $_.identifier -eq $runtime.identifier } | Select-Object -First 1
             if ($runtimeFound) {
                 $devicesToAdd = Build-XcodeDevicesList -XcodeInfo $_ -Runtime $runtimeFound
                 $runtimeDevices += $devicesToAdd | Select-Object -ExpandProperty name
-                $xcodeList += $_.VersionInfo.Version
             }
         }
-
-        $xcodeList = $xcodeList | Sort-Object
         $runtimeDevices = $runtimeDevices | ForEach-Object { Format-XcodeSimulatorName $_ } | Select-Object -Unique
-        $sortedRuntimeDevices = $runtimeDevices | Sort-Object @{
-            Expression = { $_.Split(" ")[0] };
-            Descending = $true;
-        }, {
-            $_.Split(" ") | Select-Object -Skip 1 | Join-String -Separator " "
+        If (($runtimeDevices | Where-Object { -not ([string]::IsNullOrWhitespace($_)) }).Count -eq 0) {
+            $sortedRuntimeDevices = @("N/A")
+        } else {
+            $sortedRuntimeDevices = $runtimeDevices | Sort-Object @{
+                Expression = { $_.Split(" ")[0] };
+                Descending = $true;
+            }, {
+                $_.Split(" ") | Select-Object -Skip 1 | Join-String -Separator " "
+            }
         }
-
         return [PSCustomObject] @{
             "OS" = $runtime.name
-            "Xcode Version" = [String]::Join("<br>", $xcodeList)
             "Simulators" = [String]::Join("<br>", $sortedRuntimeDevices)
         }
     } | Sort-Object {
diff --git a/images/macos/toolsets/toolset-14.json b/images/macos/toolsets/toolset-14.json
index a4ca9c51..fdd3dda4 100644
--- a/images/macos/toolsets/toolset-14.json
+++ b/images/macos/toolsets/toolset-14.json
@@ -4,7 +4,7 @@
         "x64": {
             "versions": [
                 { "link": "16.1_beta", "version": "16.1.0-Beta+16B5001e", "symlinks": ["16.1"], "install_runtimes": "true", "sha256": "8848aacb32bdc0abbd7e14e4b712e07c98f4b6e5a23a8d77db03ab21dcb3c777"},
-                { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "false", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"},
+                { "link": "16_beta_6", "version": "16.0.0-Beta.6+16A5230g", "symlinks": ["16.0"], "install_runtimes": "true", "sha256": "ab0b9a4f6d723420ee0e39ff1cf6a628665dfe832053f66b6b72e013a6bbb244"},
                 { "link": "15.4", "version": "15.4.0+15F31d", "install_runtimes": "true", "sha256": "82d3d61804ff3f4c7c82085e91dc701037ddaa770e542848b2477e22f4e8aa7a"},
                 { "link": "15.3", "version": "15.3.0+15E204a", "install_runtimes": "true", "sha256": "f13f6a2e2df432c3008e394640b8549a18c285acd7fd148d6c4bac8c3a5af234"},
                 { "link": "15.2", "version": "15.2.0+15C500b", "install_runtimes": "true", "sha256": "04E93680C6DDBEC84666531BE412DE778AFC8EAC6AB2037F4C2BE7290818B59B"},