From 9f5b4b2fd324f9d799d8502e0d36fe6d2fe0f413 Mon Sep 17 00:00:00 2001
From: Alexey-Ayupov <116575425+Alexey-Ayupov@users.noreply.github.com>
Date: Fri, 28 Apr 2023 10:07:08 +0200
Subject: [PATCH] [macOS] Fix software report for macos 13 (#7510)

---
 images/macos/software-report/SoftwareReport.Common.psm1  | 2 +-
 .../macos/software-report/SoftwareReport.Generator.ps1   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index 38b34d5f2..c060f453e 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -634,4 +634,4 @@ function Get-ColimaVersion {
 function Get-PKGConfigVersion {
     $pkgconfigVersion = Run-Command "pkg-config --version"
     return $pkgconfigVersion
-}
+}
\ No newline at end of file
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index a69e53949..908fd5b39 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -38,10 +38,10 @@ $languageAndRuntime.AddToolVersion("Bash", $(Get-BashVersion))
 $languageAndRuntime.AddNodes($(Get-ClangLLVMVersions))
 $languageAndRuntime.AddNodes($(Get-GccVersions))
 $languageAndRuntime.AddNodes($(Get-FortranVersions))
-$languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion))
 $languageAndRuntime.AddToolVersion("Julia", $(Get-JuliaVersion))
 $languageAndRuntime.AddToolVersion("Kotlin", $(Get-KotlinVersion))
 if (-not $os.IsVentura) {
+    $languageAndRuntime.AddToolVersion("Go", $(Get-GoVersion))
     $languageAndRuntime.AddToolVersion("Mono", $(Get-MonoVersion))
     $languageAndRuntime.AddToolVersion("MSBuild", $(Get-MSBuildVersion))
     $languageAndRuntime.AddToolVersion("Node.js", $(Get-NodeVersion))
@@ -68,8 +68,8 @@ if (-not $os.IsVentura) {
     $packageManagement.AddToolVersion("Miniconda", $(Get-CondaVersion))
 }
 $packageManagement.AddToolVersion("NPM", $(Get-NPMVersion))
-$packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
 if (-not $os.IsVentura) {
+    $packageManagement.AddToolVersion("NuGet", $(Get-NuGetVersion))
     $packageManagement.AddToolVersion("Pip", $(Get-PipVersion -Version 2))
     $packageManagement.AddToolVersion("Pip3", $(Get-PipVersion -Version 3))
     $packageManagement.AddToolVersion("Pipx", $(Get-PipxVersion))
@@ -78,8 +78,9 @@ $packageManagement.AddToolVersion("RubyGems", $(Get-RubyGemsVersion))
 $packageManagement.AddToolVersion("Vcpkg", $(Get-VcpkgVersion))
 $packageManagement.AddToolVersion("Yarn", $(Get-YarnVersion))
 
-$packageManagement.AddNode($(Build-PackageManagementEnvironmentTable))
-
+if (-not $os.IsVentura) {
+    $packageManagement.AddNode($(Build-PackageManagementEnvironmentTable))
+}
 # Project Management
 $projectManagement = $installedSoftware.AddHeader("Project Management")
 $projectManagement.AddToolVersion("Apache Ant", $(Get-ApacheAntVersion))