From 400357a5e8bc1928b2f5bc88763324f8e967ba3c Mon Sep 17 00:00:00 2001
From: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
Date: Wed, 28 Jan 2026 12:26:09 +0000
Subject: [PATCH 1/3] Adding copilot cli to the codespace definition

---
 .devcontainer/dotnet/devcontainer.json | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/dotnet/devcontainer.json b/.devcontainer/dotnet/devcontainer.json
index b16fcacd69..4ab7c196c6 100644
--- a/.devcontainer/dotnet/devcontainer.json
+++ b/.devcontainer/dotnet/devcontainer.json
@@ -6,10 +6,24 @@
     "dockerfile": "dotnet.Dockerfile"
   },
   "features": {
-    "ghcr.io/devcontainers/features/dotnet:2.4.2": {},
-    "ghcr.io/devcontainers/features/powershell:1.5.1": {},
     "ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.14.0": {}
+    "ghcr.io/devcontainers/features/docker-in-docker:2.14.0": {},
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "version": "2"
+    },
+    "ghcr.io/devcontainers/features/powershell:1": {
+      "version": "latest"
+    },
+    "ghcr.io/azure/azure-dev/azd:0": {
+      "version": "latest"
+    },
+    "ghcr.io/devcontainers/features/common-utils:2": {},
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "version": "none",
+      "dotnetRuntimeVersions": "10.0",
+      "aspNetCoreRuntimeVersions": "10.0"
+    },
+    "ghcr.io/devcontainers/features/copilot-cli:1": {}
   },
   "workspaceFolder": "/workspaces/agent-framework/dotnet/",
   "customizations": {

From dcf9b6cc3fbce9956fc4049b9f5e79d267bcc3ef Mon Sep 17 00:00:00 2001
From: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
Date: Wed, 28 Jan 2026 15:08:43 +0000
Subject: [PATCH 2/3] Update tools

---
 .devcontainer/dotnet/devcontainer.json | 3 ++-
 .devcontainer/dotnet/dotnet.Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/dotnet/devcontainer.json b/.devcontainer/dotnet/devcontainer.json
index 4ab7c196c6..64fb75c723 100644
--- a/.devcontainer/dotnet/devcontainer.json
+++ b/.devcontainer/dotnet/devcontainer.json
@@ -17,7 +17,6 @@
     "ghcr.io/azure/azure-dev/azd:0": {
       "version": "latest"
     },
-    "ghcr.io/devcontainers/features/common-utils:2": {},
     "ghcr.io/devcontainers/features/dotnet:2": {
       "version": "none",
       "dotnetRuntimeVersions": "10.0",
@@ -29,6 +28,8 @@
   "customizations": {
     "vscode": {
       "extensions": [
+        "GitHub.copilot",
+        "GitHub.vscode-github-actions",
         "ms-dotnettools.csdevkit",
         "vscode-icons-team.vscode-icons",
         "ms-windows-ai-studio.windows-ai-studio"
diff --git a/.devcontainer/dotnet/dotnet.Dockerfile b/.devcontainer/dotnet/dotnet.Dockerfile
index ecf1b14428..344e4ee813 100644
--- a/.devcontainer/dotnet/dotnet.Dockerfile
+++ b/.devcontainer/dotnet/dotnet.Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/dotnet
+FROM mcr.microsoft.com/devcontainers/universal:latest
 
 # Remove Yarn repository with expired GPG key to prevent apt-get update failures
 # Tracking issue: https://github.com/devcontainers/images/issues/1752

From 0e8bf422047922663fbece2925caef03475638ba Mon Sep 17 00:00:00 2001
From: Roger Barreto <19890735+rogerbarreto@users.noreply.github.com>
Date: Wed, 28 Jan 2026 17:12:02 +0000
Subject: [PATCH 3/3] Remove unecessary tools

---
 .devcontainer/dotnet/devcontainer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.devcontainer/dotnet/devcontainer.json b/.devcontainer/dotnet/devcontainer.json
index 64fb75c723..6ec44f9004 100644
--- a/.devcontainer/dotnet/devcontainer.json
+++ b/.devcontainer/dotnet/devcontainer.json
@@ -7,7 +7,6 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/azure-cli:1.2.9": {},
-    "ghcr.io/devcontainers/features/docker-in-docker:2.14.0": {},
     "ghcr.io/devcontainers/features/github-cli:1": {
       "version": "2"
     },