From d48bfb5671579e5db35ecc1b0ff422b19c313103 Mon Sep 17 00:00:00 2001
From: Dusko Dobranic <101048884+ddobranic@users.noreply.github.com>
Date: Fri, 12 Aug 2022 09:46:38 +0200
Subject: [PATCH] Revert "[macOS] Added CodeQL (#6059)" (#6066)

This reverts commit d2c52297ae370ed7d83cb2cd59aec7171beceba2.
---
 images/macos/software-report/SoftwareReport.Common.psm1   | 5 -----
 images/macos/software-report/SoftwareReport.Generator.ps1 | 3 +--
 images/macos/tests/Common.Tests.ps1                       | 6 ------
 images/macos/toolsets/toolset-11.json                     | 3 +--
 images/macos/toolsets/toolset-12.json                     | 3 +--
 5 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index a13e91b7b..56d68f6e1 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -584,9 +584,4 @@ function Build-GraalVMTable {
         "Version" = $version
         "Environment variables" = $envVariables
     }
-}
-
-function Get-CodeQLVersion {
-    $codeqlVersion = Run-Command "codeql version --quiet"
-    return "$codeqlVersion"
 }
\ 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 9533fe3ec..199635d4f 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -159,8 +159,7 @@ $toolsList = @(
     (Get-AzureDevopsVersion),
     (Get-AWSCLIVersion),
     (Get-AWSSAMCLIVersion),
-    (Get-AWSSessionManagerCLIVersion),
-    (Get-CodeQLVersion)
+    (Get-AWSSessionManagerCLIVersion)
 )
 
 if ($os.IsLessThanMonterey) {
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 6c3f02edd..7e78b182d 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -137,10 +137,4 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) {
     It "Check kext kernel modules" {
         kextstat | Out-String | Should -Match "org.virtualbox.kext"
     }
-}
-
-Describe "codeql" {
-    It "codeql" {
-        "codeql version" | Should -ReturnZeroExitCode
-    }
 }
\ No newline at end of file
diff --git a/images/macos/toolsets/toolset-11.json b/images/macos/toolsets/toolset-11.json
index 682fcc8b9..51e7f8d61 100644
--- a/images/macos/toolsets/toolset-11.json
+++ b/images/macos/toolsets/toolset-11.json
@@ -228,8 +228,7 @@
             "imagemagick"
         ],
         "cask_packages": [
-            "julia",
-            "codeql"
+            "julia"
         ]
     },
     "gcc": {
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index 4fa94d711..96a5e6988 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -178,8 +178,7 @@
         "cask_packages": [
             "julia",
             "vagrant",
-            "virtualbox",
-            "codeql"
+            "virtualbox"
         ]
     },
     "gcc": {