From b39bfdbb04484c5bf2de6d5065f7da3002f5a80f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Fri, 17 Jan 2025 11:22:15 +0100
Subject: [PATCH 1/7] Upgrade workflows to ubuntu-24

---
 .devcontainer/swift/Dockerfile                                | 4 ++--
 .github/workflows/swift.yml                                   | 2 +-
 .../Security/CWE-094/.github/workflows/self_needs.yml         | 2 +-
 .../query-tests/Security/CWE-094/.github/workflows/test10.yml | 2 +-
 .../query-tests/Security/CWE-094/.github/workflows/test23.yml | 2 +-
 .../query-tests/Security/CWE-094/.github/workflows/test24.yml | 2 +-
 .../CWE-829/.github/workflows/issue_comment_octokit.yml       | 2 +-
 .../CWE-829/.github/workflows/issue_comment_octokit2.yml      | 2 +-
 .../.github/workflows/should_be_using_advanced_setup.yml      | 4 ++--
 .../ql/integration-tests/all-platforms/autobuild/global.json  | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.devcontainer/swift/Dockerfile b/.devcontainer/swift/Dockerfile
index 9b43eaf4f34e..dddf18e1f87c 100644
--- a/.devcontainer/swift/Dockerfile
+++ b/.devcontainer/swift/Dockerfile
@@ -1,7 +1,7 @@
 # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.236.0/containers/cpp/.devcontainer/base.Dockerfile
 
-# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-20.04, ubuntu-18.04
-FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-ubuntu-22.04
+# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-24.04, ubuntu-20.04, ubuntu-18.04
+FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-ubuntu-24.04
 
 USER root
 ADD root.sh /tmp/root.sh
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index d40376149f7f..2d3e7263274e 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -50,7 +50,7 @@ jobs:
       - uses: ./swift/actions/build-and-test
   build-and-test-linux:
     if: github.repository_owner == 'github'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: ./swift/actions/build-and-test
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml
index 9992fd8e4cbd..5390612f105d 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/self_needs.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   test1:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       job_output: ${{ steps.source.outputs.value }}
     steps:
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml
index 1bc02ccd826e..2e734076cb71 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test10.yml
@@ -491,7 +491,7 @@ jobs:
 
   send_results:
     name: Send results to webhook
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: always()
     needs: [
         setup,
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test23.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test23.yml
index 184bcd966108..77e4c565fbe7 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test23.yml
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test23.yml
@@ -3,7 +3,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: >
       (github.event.workflow_run.event == 'pull_request' ||
       github.event.workflow_run.event == 'pull_request_target') &&
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test24.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test24.yml
index a90c55df9377..c1846b8f51ec 100644
--- a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test24.yml
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/test24.yml
@@ -3,7 +3,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Run Issue form parser
         id: parse
diff --git a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit.yml b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit.yml
index 1245d0302fb4..ac013eb6e2f9 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   test1: 
     if: github.event.comment.body == '@metabase-bot run visual tests'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Fetch issue
         uses: octokit/request-action@v2.x
diff --git a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit2.yml b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit2.yml
index 84081fef5d06..8485ad0ed671 100644
--- a/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit2.yml
+++ b/actions/ql/test/query-tests/Security/CWE-829/.github/workflows/issue_comment_octokit2.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   test1:
     if: github.event.comment.body == '@metabase-bot run visual tests'
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Fetch issue
         uses: octokit/request-action@v2.x
diff --git a/actions/ql/test/query-tests/Violations Of Best Practice/CodeQL/.github/workflows/should_be_using_advanced_setup.yml b/actions/ql/test/query-tests/Violations Of Best Practice/CodeQL/.github/workflows/should_be_using_advanced_setup.yml
index e736d567773b..ff1e1b808291 100644
--- a/actions/ql/test/query-tests/Violations Of Best Practice/CodeQL/.github/workflows/should_be_using_advanced_setup.yml	
+++ b/actions/ql/test/query-tests/Violations Of Best Practice/CodeQL/.github/workflows/should_be_using_advanced_setup.yml	
@@ -21,9 +21,9 @@ jobs:
       matrix:
         include:
           - language: javascript
-            os: ubuntu-22.04
+            os: ubuntu-24.04
           - language: ruby
-            os: ubuntu-22.04-16core
+            os: ubuntu-24.04-16core
 
     steps:
       - name: Checkout repository
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/global.json b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
index bb4954bd9edc..7a0e39d71fa7 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/global.json
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "5.0.408"
+        "version": "9.0.100"
     }
 }
\ No newline at end of file

From bb47f5b6de496e6fc1a12604f1a835e864eaac08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Fri, 17 Jan 2025 11:33:43 +0100
Subject: [PATCH 2/7] Update csharp target framework to net9.0

---
 .github/workflows/swift.yml                                 | 6 ------
 .../all-platforms/autobuild/Files.expected                  | 4 ++--
 .../all-platforms/autobuild/autobuild.csproj                | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index 2d3e7263274e..23a97af6bafb 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -48,12 +48,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./swift/actions/build-and-test
-  build-and-test-linux:
-    if: github.repository_owner == 'github'
-    runs-on: ubuntu-24.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./swift/actions/build-and-test
   qltests-macos:
     if: ${{ github.repository_owner == 'github' && github.event_name == 'pull_request' }}
     needs: build-and-test-macos
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
index f13c50c16806..25ecf88250ad 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
@@ -1,3 +1,3 @@
 | Program.cs:0:0:0:0 | Program.cs |
-| obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
-| obj/Debug/net5.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net5.0/autobuild.AssemblyInfo.cs |
+| obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
+| obj/Debug/net9.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/autobuild.AssemblyInfo.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
index c3285bc0ac27..8bb8e6387f97 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

From 8ef4c2c22917fca8e9e6b37a6cc1d36cd077ff55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Fri, 17 Jan 2025 11:35:34 +0100
Subject: [PATCH 3/7] Remove ImplicitUsings label, not supported by Net 6.0

---
 .../integration-tests/all-platforms/autobuild/Files.expected  | 4 ++--
 .../all-platforms/autobuild/autobuild.csproj                  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
index 25ecf88250ad..f13c50c16806 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
@@ -1,3 +1,3 @@
 | Program.cs:0:0:0:0 | Program.cs |
-| obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
-| obj/Debug/net9.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/autobuild.AssemblyInfo.cs |
+| obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
+| obj/Debug/net5.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net5.0/autobuild.AssemblyInfo.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
index 8bb8e6387f97..9168cd05ff7b 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
+    <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

From 82704c0426973c8d84154d669ab492d54c79ac38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Wed, 22 Jan 2025 11:31:25 +0100
Subject: [PATCH 4/7] Suggestions from PR

---
 .../integration-tests/all-platforms/autobuild/autobuild.csproj  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
index 9168cd05ff7b..c40553b9f48b 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

From 208551c9f276c8964f6270a408e8670ff5319736 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Wed, 22 Jan 2025 11:59:24 +0100
Subject: [PATCH 5/7] Update test expected strings for net9

---
 .../integration-tests/all-platforms/autobuild/Files.expected  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
index f13c50c16806..fe9e0c87a706 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
@@ -1,3 +1,3 @@
 | Program.cs:0:0:0:0 | Program.cs |
-| obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
-| obj/Debug/net5.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net5.0/autobuild.AssemblyInfo.cs |
+| obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
+| obj/Debug/net9.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/autobuild.AssemblyInfo.cs |

From 769c627022619f5b784aa7b5c61506666d8bda6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Wed, 22 Jan 2025 12:28:31 +0100
Subject: [PATCH 6/7] Revert updating .net version

---
 .../integration-tests/all-platforms/autobuild/Files.expected  | 4 ++--
 .../all-platforms/autobuild/autobuild.csproj                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
index fe9e0c87a706..f13c50c16806 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/Files.expected
@@ -1,3 +1,3 @@
 | Program.cs:0:0:0:0 | Program.cs |
-| obj/Debug/net9.0/.NETCoreApp,Version=v9.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net9.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
-| obj/Debug/net9.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net9.0/autobuild.AssemblyInfo.cs |
+| obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs:0:0:0:0 | obj/Debug/net5.0/.NETCoreApp,Version=v5.0.AssemblyAttributes.cs |
+| obj/Debug/net5.0/autobuild.AssemblyInfo.cs:0:0:0:0 | obj/Debug/net5.0/autobuild.AssemblyInfo.cs |
diff --git a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
index c40553b9f48b..9168cd05ff7b 100644
--- a/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
+++ b/csharp/ql/integration-tests/all-platforms/autobuild/autobuild.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net9.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

From 4fb2273153a460ae051a03b80b8e46862fc501be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20San=20Jos=C3=A9?= <oscarsj@github.com>
Date: Wed, 22 Jan 2025 15:55:56 +0100
Subject: [PATCH 7/7] Remove .devcontainer/swift files, as testing swift on
 ubuntu 24 is not supported

---
 .devcontainer/swift/Dockerfile        |  9 -------
 .devcontainer/swift/devcontainer.json | 25 --------------------
 .devcontainer/swift/root.sh           | 34 ---------------------------
 .devcontainer/swift/update-codeql.sh  | 20 ----------------
 .devcontainer/swift/user.sh           | 15 ------------
 5 files changed, 103 deletions(-)
 delete mode 100644 .devcontainer/swift/Dockerfile
 delete mode 100644 .devcontainer/swift/devcontainer.json
 delete mode 100755 .devcontainer/swift/root.sh
 delete mode 100755 .devcontainer/swift/update-codeql.sh
 delete mode 100755 .devcontainer/swift/user.sh

diff --git a/.devcontainer/swift/Dockerfile b/.devcontainer/swift/Dockerfile
deleted file mode 100644
index dddf18e1f87c..000000000000
--- a/.devcontainer/swift/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.236.0/containers/cpp/.devcontainer/base.Dockerfile
-
-# [Choice] Debian / Ubuntu version (use Debian 11, Ubuntu 18.04/22.04 on local arm64/Apple Silicon): debian-11, debian-10, ubuntu-22.04, ubuntu-24.04, ubuntu-20.04, ubuntu-18.04
-FROM mcr.microsoft.com/vscode/devcontainers/cpp:0-ubuntu-24.04
-
-USER root
-ADD root.sh /tmp/root.sh
-ADD update-codeql.sh /usr/local/bin/update-codeql
-RUN bash /tmp/root.sh && rm /tmp/root.sh
diff --git a/.devcontainer/swift/devcontainer.json b/.devcontainer/swift/devcontainer.json
deleted file mode 100644
index 97cd1bd022a2..000000000000
--- a/.devcontainer/swift/devcontainer.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"extensions": [
-		"github.vscode-codeql",
-		"hbenl.vscode-test-explorer",
-		"ms-vscode.test-adapter-converter",
-		"slevesque.vscode-zipexplorer",
-		"ms-vscode.cpptools"
-	],
-	"settings": {
-		"files.watcherExclude": {
-			"**/target/**": true
-		},
-		"codeQL.runningQueries.memory": 2048
-	},
-	"build": {
-		"dockerfile": "Dockerfile",
-	},
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined"
-	],
-	"remoteUser": "vscode",
-	"onCreateCommand": ".devcontainer/swift/user.sh"
-}
diff --git a/.devcontainer/swift/root.sh b/.devcontainer/swift/root.sh
deleted file mode 100755
index 33ffba0a741c..000000000000
--- a/.devcontainer/swift/root.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-set -xe
-
-BAZELISK_VERSION=v1.12.0
-BAZELISK_DOWNLOAD_SHA=6b0bcb2ea15bca16fffabe6fda75803440375354c085480fe361d2cbf32501db
-
-# install git lfs apt source
-curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
-
-# install gh apt source
-(type -p wget >/dev/null || (sudo apt update && sudo apt-get install wget -y)) \
-&& sudo mkdir -p -m 755 /etc/apt/keyrings \
-&& wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
-&& sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
-&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-
-apt-get update
-export DEBIAN_FRONTEND=noninteractive
-apt-get -y install --no-install-recommends \
-    zlib1g-dev \
-    uuid-dev \
-    python3-distutils \
-    python3-pip \
-    bash-completion \
-    git-lfs \
-    gh
-
-# Install Bazel
-curl -fSsL -o /usr/local/bin/bazelisk https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-linux-amd64
-echo "${BAZELISK_DOWNLOAD_SHA} */usr/local/bin/bazelisk" | sha256sum --check -
-chmod 0755 /usr/local/bin/bazelisk
-ln -s bazelisk /usr/local/bin/bazel
-
-# install latest codeql
-update-codeql
diff --git a/.devcontainer/swift/update-codeql.sh b/.devcontainer/swift/update-codeql.sh
deleted file mode 100755
index 51fd7a612d36..000000000000
--- a/.devcontainer/swift/update-codeql.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-
-URL=https://github.com/github/codeql-cli-binaries/releases
-LATEST_VERSION=$(curl -L -s -H 'Accept: application/json' $URL/latest | sed -e 's/.*"tag_name":"\([^"]*\)".*/\1/')
-CURRENT_VERSION=v$(codeql version 2>/dev/null | sed -ne 's/.*release \([0-9.]*\)\./\1/p')
-if [[ $CURRENT_VERSION != $LATEST_VERSION ]]; then
-  if [[ $UID != 0 ]]; then
-    echo "update required, please run this script with sudo:"
-    echo "  sudo $0"
-    exit 1
-  fi
-  ZIP=$(mktemp codeql.XXXX.zip)
-  curl -fSqL -o $ZIP $URL/download/$LATEST_VERSION/codeql-linux64.zip
-  unzip -q $ZIP -d /opt
-  rm $ZIP
-  ln -sf /opt/codeql/codeql /usr/local/bin/codeql
-  echo installed version $LATEST_VERSION
-else
-  echo current version $CURRENT_VERSION is up-to-date
-fi
diff --git a/.devcontainer/swift/user.sh b/.devcontainer/swift/user.sh
deleted file mode 100755
index 1de3485a723b..000000000000
--- a/.devcontainer/swift/user.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-set -xe
-
-git lfs install
-
-# add the workspace to the codeql search path
-mkdir -p /home/vscode/.config/codeql
-echo "--search-path /workspaces/codeql" > /home/vscode/.config/codeql/config
-
-# create a swift extractor pack with the current state
-cd /workspaces/codeql
-bazel run swift/create-extractor-pack
-
-#install and set up pre-commit
-python3 -m pip install pre-commit --no-warn-script-location
-$HOME/.local/bin/pre-commit install