From dc4d01590fbb33bf42fe0046b40f8a0e0bd11ee5 Mon Sep 17 00:00:00 2001
From: Justin Grote <15258962+JustinGrote@users.noreply.github.com.>
Date: Wed, 14 May 2025 17:51:08 -0700
Subject: [PATCH 1/7] Initial Devcontainer

---
 .devcontainer/devcontainer.json | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..c724a8b064
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,27 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
+{
+	"name": "PowerShell Extension",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
+	"features": {
+		"ghcr.io/devcontainers/features/dotnet:2": {},
+		"ghcr.io/devcontainers/features/powershell:1": {
+			"version": "latest"
+		},
+		"ghcr.io/devcontainers/features/git:1": {}
+	},
+	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices"
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "yarn install",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	// "remoteUser": "root"
+}

From a676d7997bad35cb5f211e5e1e8860d893da5e47 Mon Sep 17 00:00:00 2001
From: Justin Grote <15258962+JustinGrote@users.noreply.github.com.>
Date: Thu, 15 May 2025 01:08:02 +0000
Subject: [PATCH 2/7] Switch to Dockerfile and dotnet image

---
 .devcontainer/Dockerfile        | 14 ++++++++++++++
 .devcontainer/devcontainer.json | 14 ++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..25a3d91ddb
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,14 @@
+# It's easier to restore node/typescript than dotnet, which is why we use this as the base
+FROM mcr.microsoft.com/devcontainers/dotnet:9.0
+
+# Install VSCode which includes the library prereqs to run vscode-test
+RUN <<SCRIPT
+apt-get update
+apt-get install -y software-properties-common apt-transport-https wget gpg
+wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > /usr/share/keyrings/packages.microsoft.gpg
+echo "deb [arch=amd64,arm64,armhf signed-by=/usr/share/keyrings/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list
+apt-get update
+apt-get install -y code
+apt-get clean
+rm -rf /var/lib/apt/lists/*
+SCRIPT
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c724a8b064..7a57b4a45d 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -3,13 +3,15 @@
 {
 	"name": "PowerShell Extension",
 	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"image": "mcr.microsoft.com/devcontainers/typescript-node:1-22-bookworm",
+	"hostRequirements": {
+		"cpus": 4 // Primarily for GitHub Codespaces, as the 2 CPU is not generally good enough for C# compilation
+	},
+	"image": "./Dockerfile",
 	"features": {
-		"ghcr.io/devcontainers/features/dotnet:2": {},
-		"ghcr.io/devcontainers/features/powershell:1": {
-			"version": "latest"
-		},
-		"ghcr.io/devcontainers/features/git:1": {}
+		"ghcr.io/devcontainers/features/node:1": {
+			"nvmVersion": "latest", // Can be used to change node versions as needed
+			"version": "20.19.0" // Keep in sync with package.json for what target vscode version uses
+		}
 	},
 	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices"
 

From 99569840158fec5f9c150ad343204eb9a2e86dba Mon Sep 17 00:00:00 2001
From: Justin Grote <15258962+JustinGrote@users.noreply.github.com.>
Date: Thu, 15 May 2025 01:57:59 +0000
Subject: [PATCH 3/7] Fix bad dockerfile ref

---
 .devcontainer/devcontainer.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 7a57b4a45d..a667ef33d0 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,9 @@
 	"hostRequirements": {
 		"cpus": 4 // Primarily for GitHub Codespaces, as the 2 CPU is not generally good enough for C# compilation
 	},
-	"image": "./Dockerfile",
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
 			"nvmVersion": "latest", // Can be used to change node versions as needed

From 5b9c5c44a8cd47ff5be7cd84642610bad9c5f0c3 Mon Sep 17 00:00:00 2001
From: Justin Grote <justingrote@users.noreply.github.com>
Date: Thu, 15 May 2025 02:38:10 +0000
Subject: [PATCH 4/7] Add X Container env

---
 .devcontainer/devcontainer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index a667ef33d0..8688aba8fc 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,8 +15,12 @@
 			"version": "20.19.0" // Keep in sync with package.json for what target vscode version uses
 		}
 	},
-	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices"
+	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices",
 
+	// Enables X forwarding for the devcontainer. Needed for vscode-test
+	"containerEnv": {
+		"DISPLAY": "unix:0"
+	}
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 

From 7881cda9771c3ec206311b9dc206fd1454dee431 Mon Sep 17 00:00:00 2001
From: Justin Grote <justingrote@users.noreply.github.com>
Date: Thu, 15 May 2025 13:01:27 +0000
Subject: [PATCH 5/7] Remove X Note

---
 .devcontainer/devcontainer.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 8688aba8fc..c0c3482d49 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,12 +15,7 @@
 			"version": "20.19.0" // Keep in sync with package.json for what target vscode version uses
 		}
 	},
-	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices",
-
-	// Enables X forwarding for the devcontainer. Needed for vscode-test
-	"containerEnv": {
-		"DISPLAY": "unix:0"
-	}
+	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices"
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 

From 329b5190cab91877b2d473f36bbd6067005f6e8d Mon Sep 17 00:00:00 2001
From: Justin Grote <15258962+JustinGrote@users.noreply.github.com.>
Date: Thu, 15 May 2025 06:22:35 -0700
Subject: [PATCH 6/7] Match .NET devcontainer version to PSES

---
 .devcontainer/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 25a3d91ddb..71191bfc98 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 # It's easier to restore node/typescript than dotnet, which is why we use this as the base
-FROM mcr.microsoft.com/devcontainers/dotnet:9.0
+FROM mcr.microsoft.com/devcontainers/dotnet:8.0
 
 # Install VSCode which includes the library prereqs to run vscode-test
 RUN <<SCRIPT

From 07b2e25e3b2dc0c403816e5add236993fb347310 Mon Sep 17 00:00:00 2001
From: Justin Grote <15258962+JustinGrote@users.noreply.github.com.>
Date: Thu, 15 May 2025 13:49:59 +0000
Subject: [PATCH 7/7] Add more prereqs

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

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 71191bfc98..d20b7fa515 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -12,3 +12,5 @@ apt-get install -y code
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 SCRIPT
+
+RUN pwsh -noni -c 'Install-PSResource -TrustRepository -Confirm:$false -Verbose Platyps'
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c0c3482d49..a702f54019 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,7 +15,7 @@
 			"version": "20.19.0" // Keep in sync with package.json for what target vscode version uses
 		}
 	},
-	"postCreateCommand": "git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices"
+	"postCreateCommand": "pwsh -c 'if (-not (Test-Path /workspaces/PowerShellEditorServices)) {git clone https://github.com/PowerShell/PowerShellEditorServices.git /workspaces/PowerShellEditorServices}'"
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],