Use node20 in devcontainer

cathalnoonan · Sep 23, 2023 · f43c800 · f43c800
1 parent 1b28662
commit f43c800
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 29 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,29 +1,28 @@
 {
-    "image": "mcr.microsoft.com/devcontainers/javascript-node:18-bullseye",
-    "features": {
-        "ghcr.io/devcontainers/features/dotnet:1": {
-            "version": "6"
-        }
-    },
-    "customizations": {
-        "vscode": {
-            "extensions": [
-                "eamodio.gitlens",
-                "editorconfig.editorconfig",
-                "streetsidesoftware.code-spell-checker"
-            ]
-        }
-    },
-    "remoteEnv": {
-        "DOTNET_NOLOGO": "1",
+  "image": "mcr.microsoft.com/devcontainers/javascript-node:20-bookworm",
+  "features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+      "version": "6.0"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "eamodio.gitlens",
+        "editorconfig.editorconfig",
+        "streetsidesoftware.code-spell-checker"
+      ]
+    }
+  },
+  "remoteEnv": {
+    "DOTNET_NOLOGO": "1",
 
-        // https://github.com/microsoft/powerplatform-vscode/issues/139
-        "DOTNET_ROLL_FORWARD": "Major"
-    },
-    "mounts": [
-        // Mount a volume for the node_modules, it improves performance significantly
-        "source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/control/node_modules,type=volume"
-    ],
-    "forwardPorts": [ 8181 ],
-    "postCreateCommand": "sudo chown -R $USER:$USER ./ && dotnet restore"
+    // https://github.com/microsoft/powerplatform-vscode/issues/139
+    "DOTNET_ROLL_FORWARD": "Major"
+  },
+  "mounts": [
+    // Mount a volume for the node_modules, it improves performance significantly
+    "source=${localWorkspaceFolderBasename}-node_modules,target=${containerWorkspaceFolder}/control/node_modules,type=volume"
+  ],
+  "forwardPorts": [8181]
 }
diff --git a/control/control.pcfproj b/control/control.pcfproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Sdk Name="Cathal.PcfTools.MSBuild.Control" Version="0.1.9" />
+  <Sdk Name="Cathal.PcfTools.MSBuild.Control" Version="0.1.10" />
   <PropertyGroup>
     <PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
   </PropertyGroup>

diff --git a/d365-pcf-imagecontrol.proj b/d365-pcf-imagecontrol.proj
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Sdk Name="Cathal.PcfTools.MSBuild.Proj" Version="0.1.9" />
+  <Sdk Name="Cathal.PcfTools.MSBuild.Proj" Version="0.1.10" />
 </Project>
diff --git a/solution/solution.cdsproj b/solution/solution.cdsproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Sdk Name="Cathal.PcfTools.MSBuild.Solution" Version="0.1.9" />
+  <Sdk Name="Cathal.PcfTools.MSBuild.Solution" Version="0.1.10" />
   <PropertyGroup>
     <PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
   </PropertyGroup>