[macOS] Don't show CodeQl in Catalina's sw report (#6139)

images/macos/software-report/SoftwareReport.Generator.ps1

@@ -159,10 +159,15 @@ $toolsList = @(
     (Get-AzureDevopsVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMCLIVersion),
-    (Get-AWSSessionManagerCLIVersion),
-    (Get-CodeQLBundleVersion)
+    (Get-AWSSessionManagerCLIVersion)
 )
 
+if (-not $os.IsCatalina) {
+    $toolsList += @(
+        (Get-CodeQLBundleVersion)
+    )
+}
+
 if ($os.IsLessThanMonterey) {
     $toolsList += @(
         (Get-AliyunCLIVersion)

images/macos/tests/Common.Tests.ps1

@@ -139,7 +139,7 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) {
     }
 }
 
-Describe "CodeQL" {
+Describe "CodeQL" -Skip:($os.IsCatalina) {
     It "codeql" {
         $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*"
         $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName