Merge remote-tracking branch 'origin/main' into koesie10/upgrade-vsce

Author: koesie10

.github/workflows/main.yml

@@ -185,7 +185,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.4', 'nightly']
+        version: ['v2.7.6', 'v2.8.5', 'v2.9.4', 'v2.10.5', 'v2.11.5', 'nightly']
       fail-fast: false
     env:
       CLI_VERSION: ${{ matrix.version }}

extensions/ql-vscode/src/vscode-tests/ensureCli.ts

@@ -38,7 +38,7 @@ const _10MB = _1MB * 10;
 
 // CLI version to test. Hard code the latest as default. And be sure
 // to update the env if it is not otherwise set.
-const CLI_VERSION = process.env.CLI_VERSION || "v2.11.4";
+const CLI_VERSION = process.env.CLI_VERSION || "v2.11.5";
 process.env.CLI_VERSION = CLI_VERSION;
 
 // Base dir where CLIs will be downloaded into

extensions/ql-vscode/src/vscode-tests/factories/remote-queries/remote-query-history-item.ts

@@ -1,3 +1,4 @@
+import { nanoid } from "nanoid";
 import { RemoteQueryHistoryItem } from "../../../remote-queries/remote-query-history-item";
 import { QueryStatus } from "../../../query-status";
 
@@ -25,7 +26,7 @@ export function createMockRemoteQueryHistoryItem({
     resultCount,
     status,
     completed: false,
-    queryId: "queryId",
+    queryId: nanoid(),
     remoteQuery: {
       queryName: "query-name",
       queryFilePath: "query-file.ql",