From 4ad9896f22a2b5a436a674b042728f092d3721e0 Mon Sep 17 00:00:00 2001
From: shati-patel <42641846+shati-patel@users.noreply.github.com>
Date: Fri, 14 Jul 2023 15:17:41 +0100
Subject: [PATCH] Remove support for CodeQL CLI versions older than 2.9.4

---
 extensions/ql-vscode/CHANGELOG.md                | 4 +++-
 extensions/ql-vscode/src/codeql-cli/cli.ts       | 2 +-
 extensions/ql-vscode/supported_cli_versions.json | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/ql-vscode/CHANGELOG.md b/extensions/ql-vscode/CHANGELOG.md
index 0396402efc7..4f3e7d32aa2 100644
--- a/extensions/ql-vscode/CHANGELOG.md
+++ b/extensions/ql-vscode/CHANGELOG.md
@@ -2,11 +2,13 @@
 
 ## [UNRELEASED]
 
+- Remove support for CodeQL CLI versions older than 2.9.4. [#2610](https://github.com/github/vscode-codeql/pull/2610)
+
 ## 1.8.7 - 29 June 2023
 
 - Show a run button on the file tab for query files, that will start a local query. This button will only show when a local database is selected in the extension. [#2544](https://github.com/github/vscode-codeql/pull/2544)
 - Add `CodeQL: Quick Evaluation Count` command to generate the count summary statistics of the results set
-  without speding the time to compute locations and strings.
+  without spending the time to compute locations and strings.
 
 ## 1.8.6 - 14 June 2023
 
diff --git a/extensions/ql-vscode/src/codeql-cli/cli.ts b/extensions/ql-vscode/src/codeql-cli/cli.ts
index 0d319333242..f0de40c06f3 100644
--- a/extensions/ql-vscode/src/codeql-cli/cli.ts
+++ b/extensions/ql-vscode/src/codeql-cli/cli.ts
@@ -1790,7 +1790,7 @@ export function shouldDebugCliServer() {
 export class CliVersionConstraint {
   // The oldest version of the CLI that we support. This is used to determine
   // whether to show a warning about the CLI being too old on startup.
-  public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.7.6");
+  public static OLDEST_SUPPORTED_CLI_VERSION = new SemVer("2.9.4");
 
   /**
    * CLI version where building QLX packs for remote queries is supported.
diff --git a/extensions/ql-vscode/supported_cli_versions.json b/extensions/ql-vscode/supported_cli_versions.json
index 4f73ce69f76..cd1bc8dba1c 100644
--- a/extensions/ql-vscode/supported_cli_versions.json
+++ b/extensions/ql-vscode/supported_cli_versions.json
@@ -3,8 +3,6 @@
   "v2.13.5",
   "v2.12.7",
   "v2.11.6",
-  "v2.7.6",
-  "v2.8.5",
   "v2.9.4",
   "v2.10.5",
   "nightly"