diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 1e4e022a7..2b8676862 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -194,6 +194,7 @@ $ghcUpVersion = Run-Command "ghcup --version" | Take-Part -Part 5 $ghcVersion = Run-Command "ghc --version" | Take-Part -Part 7 $cabalVersion = Run-Command "cabal --version" | Take-Part -Part 3 $stackVersion = Run-Command "stack --version" | Take-Part -Part 1 | ForEach-Object {$_.replace(",","")} +$xcodeVersion = Run-Command "pkgutil --pkg-info com.apple.pkg.CLTools_Executables" | Select -Index 1 | Take-Part -Part 1 $markdown += New-MDHeader "Tools" -Level 3 $markdown += New-MDList -Style Unordered -NoNewLine -Lines @( @@ -204,7 +205,8 @@ $markdown += New-MDList -Style Unordered -NoNewLine -Lines @( "AWS CLI ${awsVersion}", "AWS SAM CLI ${awsSamVersion}", "AWS Session Manager CLI ${awsSessionManagerVersion}", - "Aliyun CLI ${aliyunVersion}" + "Aliyun CLI ${aliyunVersion}", + "Xcode Command Line Tools ${xcodeVersion}" ) if( -not $os.IsHighSierra) { @@ -323,4 +325,4 @@ if (-not (Test-Path $OutputDirectory)) { New-Item -Path $OutputDirectory -ItemTy # Write-Host $markdownExtended $systemInfo | Out-File -FilePath "${OutputDirectory}/systeminfo.txt" -Encoding UTF8NoBOM -$markdown | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM \ No newline at end of file +$markdown | Out-File -FilePath "${OutputDirectory}/systeminfo.md" -Encoding UTF8NoBOM diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1 index 31967d30f..b363968fb 100644 --- a/images/macos/software-report/SoftwareReport.Xcode.psm1 +++ b/images/macos/software-report/SoftwareReport.Xcode.psm1 @@ -244,4 +244,4 @@ function Build-XcodeSupportToolsSection { $output += New-MDHeader "Xcode Support Tools" -Level 4 $output += New-MDList -Style Unordered -Lines $toolList return $output -} \ No newline at end of file +}