diff --git a/src/dotnet-fsharp/.devcontainer/devcontainer.json b/src/dotnet-fsharp/.devcontainer/devcontainer.json index f7734e4a..2bb94168 100644 --- a/src/dotnet-fsharp/.devcontainer/devcontainer.json +++ b/src/dotnet-fsharp/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "F# (.NET)", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm", + "image": "mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble", // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/src/dotnet-fsharp/devcontainer-template.json b/src/dotnet-fsharp/devcontainer-template.json index 3ba298e8..68d340e5 100644 --- a/src/dotnet-fsharp/devcontainer-template.json +++ b/src/dotnet-fsharp/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "dotnet-fsharp", - "version": "3.1.2", + "version": "3.2.0", "name": "F# (.NET)", "description": "Develop F# and .NET based applications. Includes all needed SDKs, extensions, and dependencies.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-fsharp", diff --git a/src/dotnet-mssql/.devcontainer/Dockerfile b/src/dotnet-mssql/.devcontainer/Dockerfile index 297b93d8..9d1d823e 100644 --- a/src/dotnet-mssql/.devcontainer/Dockerfile +++ b/src/dotnet-mssql/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/dotnet:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/dotnet:2-${templateOption:imageVariant} # Install SQL Tools: SQLPackage and sqlcmd COPY mssql/installSQLtools.sh installSQLtools.sh diff --git a/src/dotnet-mssql/README.md b/src/dotnet-mssql/README.md index 79248b42..5519087e 100644 --- a/src/dotnet-mssql/README.md +++ b/src/dotnet-mssql/README.md @@ -7,7 +7,7 @@ Develop C# and .NET Core based applications. Includes all needed SDKs, extension | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | .NET version: | string | 9.0-bookworm | +| imageVariant | .NET version: | string | 10.0-noble | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/dotnet-mssql/devcontainer-template.json b/src/dotnet-mssql/devcontainer-template.json index 517a96af..8f771ee9 100644 --- a/src/dotnet-mssql/devcontainer-template.json +++ b/src/dotnet-mssql/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "dotnet-mssql", - "version": "3.6.0", + "version": "3.7.0", "name": "C# (.NET) and MS SQL", "description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and an MS SQL container for parallel database development. Adds an additional MS SQL container to the C# (.NET Core) container definition and deploys any .dacpac files from the mssql .devcontainer folder.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-mssql", @@ -11,18 +11,17 @@ "type": "string", "description": ".NET version:", "proposals": [ - "10.0-preview", + "10.0", "9.0", "8.0", - "10.0-preview-trixie", "9.0-bookworm", "8.0-bookworm", - "10.0-preview-noble", + "10.0-noble", "9.0-noble", "8.0-noble", "8.0-jammy" ], - "default": "9.0-bookworm" + "default": "10.0-noble" } }, "platforms": [ diff --git a/src/dotnet-postgres/.devcontainer/Dockerfile b/src/dotnet-postgres/.devcontainer/Dockerfile index f2036716..741e7438 100644 --- a/src/dotnet-postgres/.devcontainer/Dockerfile +++ b/src/dotnet-postgres/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/dotnet:1-${templateOption:imageVariant} +FROM mcr.microsoft.com/devcontainers/dotnet:2-${templateOption:imageVariant} # [Optional] Uncomment this section to install additional OS packages. # RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \ diff --git a/src/dotnet-postgres/README.md b/src/dotnet-postgres/README.md index 56912763..e214a51a 100644 --- a/src/dotnet-postgres/README.md +++ b/src/dotnet-postgres/README.md @@ -7,7 +7,7 @@ Develop C# and .NET Core based applications. Includes all needed SDKs, extension | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | .NET version: | string | 9.0-bookworm | +| imageVariant | .NET version: | string | 10.0-noble | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/dotnet-postgres/devcontainer-template.json b/src/dotnet-postgres/devcontainer-template.json index e5435b92..7a3d6a76 100644 --- a/src/dotnet-postgres/devcontainer-template.json +++ b/src/dotnet-postgres/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "dotnet-postgres", - "version": "3.5.0", + "version": "3.6.0", "name": "C# (.NET) and PostgreSQL", "description": "Develop C# and .NET Core based applications. Includes all needed SDKs, extensions, dependencies and a PostgreSQL container for parallel database development. Adds an additional PostgreSQL container to the C# (.NET Core) container definition.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet-postgres", @@ -11,18 +11,17 @@ "type": "string", "description": ".NET version:", "proposals": [ - "10.0-preview", + "10.0", "9.0", "8.0", - "10.0-preview-trixie", "9.0-bookworm", "8.0-bookworm", - "10.0-preview-noble", + "10.0-noble", "9.0-noble", "8.0-noble", "8.0-jammy" ], - "default": "9.0-bookworm" + "default": "10.0-noble" } }, "platforms": [ diff --git a/src/dotnet/.devcontainer/devcontainer.json b/src/dotnet/.devcontainer/devcontainer.json index b5deeb46..3fc07a58 100644 --- a/src/dotnet/.devcontainer/devcontainer.json +++ b/src/dotnet/.devcontainer/devcontainer.json @@ -3,7 +3,7 @@ { "name": "C# (.NET)", // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile - "image": "mcr.microsoft.com/devcontainers/dotnet:1-${templateOption:imageVariant}" + "image": "mcr.microsoft.com/devcontainers/dotnet:2-${templateOption:imageVariant}" // Features to add to the dev container. More info: https://containers.dev/features. // "features": {}, diff --git a/src/dotnet/README.md b/src/dotnet/README.md index ea1c30ea..7ccb72d8 100644 --- a/src/dotnet/README.md +++ b/src/dotnet/README.md @@ -7,7 +7,7 @@ Develop C# and .NET based applications. Includes all needed SDKs, extensions, an | Options Id | Description | Type | Default Value | |-----|-----|-----|-----| -| imageVariant | .NET version: | string | 9.0-bookworm | +| imageVariant | .NET version: | string | 10.0-noble | This template references an image that was [pre-built](https://containers.dev/implementors/reference/#prebuilding) to automatically include needed devcontainer.json metadata. diff --git a/src/dotnet/devcontainer-template.json b/src/dotnet/devcontainer-template.json index 769f1e2b..4ac2218c 100644 --- a/src/dotnet/devcontainer-template.json +++ b/src/dotnet/devcontainer-template.json @@ -1,6 +1,6 @@ { "id": "dotnet", - "version": "3.5.0", + "version": "3.6.0", "name": "C# (.NET)", "description": "Develop C# and .NET based applications. Includes all needed SDKs, extensions, and dependencies.", "documentationURL": "https://github.com/devcontainers/templates/tree/main/src/dotnet", @@ -11,18 +11,17 @@ "type": "string", "description": ".NET version:", "proposals": [ - "10.0-preview", + "10.0", "9.0", "8.0", - "10.0-preview-trixie", "9.0-bookworm", "8.0-bookworm", - "10.0-preview-noble", + "10.0-noble", "9.0-noble", "8.0-noble", "8.0-jammy" ], - "default": "9.0-bookworm" + "default": "10.0-noble" } }, "platforms": [ diff --git a/test/dotnet-mssql/test.sh b/test/dotnet-mssql/test.sh index 5f3b57b5..645bc135 100755 --- a/test/dotnet-mssql/test.sh +++ b/test/dotnet-mssql/test.sh @@ -17,8 +17,9 @@ check "dotnet" dotnet --info check "nuget" dotnet restore check "msbuild" dotnet msbuild rm -rf obj bin -check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10" +check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 24" check "nvm-node" bash -c ". /usr/local/share/nvm/nvm.sh && node --version" +check "corepack" bash -c ". /usr/local/share/nvm/nvm.sh && corepack enable" check "yarn" bash -c ". /usr/local/share/nvm/nvm.sh && yarn --version" # Report result diff --git a/test/dotnet-postgres/test.sh b/test/dotnet-postgres/test.sh index d15f1bea..e319db43 100755 --- a/test/dotnet-postgres/test.sh +++ b/test/dotnet-postgres/test.sh @@ -16,8 +16,9 @@ check "dotnet" dotnet --info check "nuget" dotnet restore check "msbuild" dotnet msbuild rm -rf obj bin -check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10" +check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 24" check "nvm-node" bash -c ". /usr/local/share/nvm/nvm.sh && node --version" +check "corepack" bash -c ". /usr/local/share/nvm/nvm.sh && corepack enable" check "yarn" bash -c ". /usr/local/share/nvm/nvm.sh && yarn --version" # Report result