From a30be143a3e877982ea5368020b84be3858a54fb Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 21:16:30 +0000
Subject: [PATCH 1/3] Replace docker-compose-plugin with docker-compose-v2

Agent-Logs-Url: https://github.com/microsoft/vscode-azurecli/sessions/338f27a7-234b-4c22-b559-be15eb053c80

Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com>
---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 1a91ee1..b977f6d 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -37,7 +37,7 @@ extends:
       - script: |
           set -e
           sudo apt-get update
-          sudo apt-get install -y docker-compose-plugin
+          sudo apt-get install -y docker-compose-v2
         displayName: Install docker compose
 
       - script: |

From 3d5d760b87811d3885b2d4b338870b67d6088483 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 21:35:30 +0000
Subject: [PATCH 2/3] Move tests from Azure Pipelines to GitHub Actions

Agent-Logs-Url: https://github.com/microsoft/vscode-azurecli/sessions/ef517cf8-f1ba-4bed-bdee-7691c91db4f5

Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com>
---
 .github/workflows/ci.yml | 31 +++++++++++++++++++++++++++++++
 azure-pipelines.yml      | 12 ------------
 2 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 .github/workflows/ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 0000000..9f9c1ab
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,31 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Compile extension
+        run: npm run compile
+
+      - name: Build test image
+        run: docker compose -f .devcontainer/docker-compose.test.yml build --no-cache --pull
+
+      - name: Test extension
+        run: docker compose -f .devcontainer/docker-compose.test.yml run vscode-azurecli-test
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index b977f6d..9a3b8ee 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -34,18 +34,6 @@ extends:
       - script: npm run compile
         displayName: Compile extension
 
-      - script: |
-          set -e
-          sudo apt-get update
-          sudo apt-get install -y docker-compose-v2
-        displayName: Install docker compose
-
-      - script: |
-          set -e
-          docker compose -f .devcontainer/docker-compose.test.yml build --no-cache --pull
-          docker compose -f .devcontainer/docker-compose.test.yml run vscode-azurecli-test
-        displayName: Test extension
-
     tsa:
       config:
         areaPath: 'Visual Studio Code Miscellaneous Extensions'

From 8e4fad1a208d519b0af8b4aa2c728d090a9ae340 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 22:13:39 +0000
Subject: [PATCH 3/3] Fix Dockerfile: replace deprecated apt-key with gpg
 --dearmor, pin to debian:bookworm

Agent-Logs-Url: https://github.com/microsoft/vscode-azurecli/sessions/fe112743-8534-4379-9b87-0029c09a9e5e

Co-authored-by: rzhao271 <7199958+rzhao271@users.noreply.github.com>
---
 .devcontainer/Dockerfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 1ca151e..654f3d9 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -3,8 +3,7 @@
 # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
 #-------------------------------------------------------------------------------------------------------------
 
-FROM debian:latest
-# FROM debian:8
+FROM debian:bookworm
 
 # Avoid warnings by switching to noninteractive
 ENV DEBIAN_FRONTEND=noninteractive
@@ -14,16 +13,16 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Install the Azure CLI
-    && apt-get install -y apt-transport-https curl gnupg2 lsb-release \
-    && echo "deb [arch=amd64] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" > /etc/apt/sources.list.d/azure-cli.list \
-    && curl -sL https://packages.microsoft.com/keys/microsoft.asc | apt-key add - 2>/dev/null \
+    && apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://packages.microsoft.com/keys/microsoft.asc \
+        | gpg --dearmor -o /etc/apt/keyrings/microsoft.gpg \
+    && chmod go+r /etc/apt/keyrings/microsoft.gpg \
+    && echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/microsoft.gpg] https://packages.microsoft.com/repos/azure-cli/ $(lsb_release -cs) main" \
+        > /etc/apt/sources.list.d/azure-cli.list \
     && apt-get update
 
 RUN apt-get install -y azure-cli
-# RUN apt-get install -y azure-cli=2.0.67-1~jessie
-# RUN apt-get install -y azure-cli=2.0.64-1~jessie
-# RUN apt-get install -y azure-cli=2.0.63-1~jessie
-# RUN apt-get install -y azure-cli=2.0.26-1~jessie
 
 # Switch back to dialog for any ad-hoc use of apt-get
 ENV DEBIAN_FRONTEND=dialog