diff --git a/src/dotnet/.devcontainer/Dockerfile b/src/dotnet/.devcontainer/Dockerfile index 3889fb351..ba48f6119 100644 --- a/src/dotnet/.devcontainer/Dockerfile +++ b/src/dotnet/.devcontainer/Dockerfile @@ -5,9 +5,9 @@ ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools RUN chmod -R a+w /usr/share/dotnet ARG VARIANT -RUN if [ "${VARIANT#*noble}" != "$VARIANT" ]; then \ +RUN if [ "${VARIANT#*noble}" != "$VARIANT" ] || [ "${VARIANT#*resolute}" != "$VARIANT" ]; then \ if id "ubuntu" &>/dev/null; then \ - echo "Deleting user 'ubuntu' for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \ + echo "Deleting user 'ubuntu' for $VARIANT" && userdel -f -r ubuntu || echo "Failed to delete ubuntu user for $VARIANT"; \ else \ echo "User 'ubuntu' does not exist for $VARIANT"; \ fi; \ diff --git a/src/dotnet/README.md b/src/dotnet/README.md index 8b8349e52..e3d5ff58e 100644 --- a/src/dotnet/README.md +++ b/src/dotnet/README.md @@ -9,10 +9,10 @@ | *Categories* | Core, Languages | | *Image type* | Dockerfile | | *Published images* | mcr.microsoft.com/devcontainers/dotnet | -| *Available image variants* | 10.0 /10.0-noble, 9.0 /9.0-bookworm, 8.0 /8.0-bookworm, 9.0-noble, 8.0-noble, 8.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) | -| *Published image architecture(s)* | x86-64, arm64/aarch64 for `bookworm`, `bullseye`, `noble`, `jammy` variants | +| *Available image variants* | 11.0-preview /11.0-preview-resolute, 10.0 /10.0-noble, 9.0 /9.0-bookworm, 8.0 /8.0-bookworm, 9.0-noble, 8.0-noble, 8.0-jammy ([full list](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list)) | +| *Published image architecture(s)* | x86-64, arm64/aarch64 for `resolute`, `bookworm`, `bullseye`, `noble`, `jammy` variants | | *Container host OS support* | Linux, macOS, Windows | -| *Container OS* | Ubuntu (`-focal`, `-jammy`, `-noble`), Debian (`-bullseye`, `-bookworm`) | +| *Container OS* | Ubuntu (`-focal`, `-jammy`, `-noble`), Debian (`-bullseye`, `-bookworm`, `-resolute`) | | *Languages, platforms* | .NET, .NET Core, C# | See **[history](history)** for information on the contents of published images. @@ -22,6 +22,7 @@ See **[history](history)** for information on the contents of published images. You can directly reference pre-built versions of `Dockerfile` by using the `image` property in `.devcontainer/devcontainer.json` or updating the `FROM` statement in your own `Dockerfile` to one of the following. An example `Dockerfile` is included in this repository. - `mcr.microsoft.com/devcontainers/dotnet` (latest) +- `mcr.microsoft.com/devcontainers/dotnet:11.0-preview` (or `11.0-preview-resolute` to pin to an OS version) - `mcr.microsoft.com/devcontainers/dotnet:10.0` (or `10.0-noble` to pin to an OS version) - `mcr.microsoft.com/devcontainers/dotnet:9.0` (or `9.0-bookworm`, `9.0-noble` to pin to an OS version) - `mcr.microsoft.com/devcontainers/dotnet:8.0` (or `8.0-bookworm`, `8.0-noble`, `8.0-jammy` to pin to an OS version) @@ -32,11 +33,11 @@ Refer to [this guide](https://containers.dev/guide/dockerfile) for more details. You can decide how often you want updates by referencing a [semantic version](https://semver.org/) of each image. For example: - `mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble` -- `mcr.microsoft.com/devcontainers/dotnet:2.0-10.0-noble` -- `mcr.microsoft.com/devcontainers/dotnet:2.0.7-10.0-noble` +- `mcr.microsoft.com/devcontainers/dotnet:2.1-10.0-noble` +- `mcr.microsoft.com/devcontainers/dotnet:2.1.0-10.0-noble` - `mcr.microsoft.com/devcontainers/dotnet:2-9.0` -- `mcr.microsoft.com/devcontainers/dotnet:2.0-9.0` -- `mcr.microsoft.com/devcontainers/dotnet:2.0.7-9.0` +- `mcr.microsoft.com/devcontainers/dotnet:2.1-9.0` +- `mcr.microsoft.com/devcontainers/dotnet:2.1.0-9.0` See [history](history) for information on the contents of each version and [here for a complete list of available tags](https://mcr.microsoft.com/v2/devcontainers/dotnet/tags/list). diff --git a/src/dotnet/manifest.json b/src/dotnet/manifest.json index 37d28328d..044fa52f3 100644 --- a/src/dotnet/manifest.json +++ b/src/dotnet/manifest.json @@ -1,7 +1,8 @@ { - "version": "2.0.7", + "version": "2.1.0", "variants": [ - "10.0-noble", + "11.0-preview-resolute", + "10.0-noble", "9.0-bookworm-slim", "9.0-noble", "8.0-bookworm-slim", @@ -15,10 +16,14 @@ "dotnet:${VERSION}-${VARIANT}" ], "architectures": { + "11.0-preview-resolute": [ + "linux/amd64", + "linux/arm64" + ], "10.0-noble": [ "linux/amd64", "linux/arm64" - ], + ], "9.0-bookworm-slim": [ "linux/amd64", "linux/arm64" @@ -38,13 +43,17 @@ "8.0-jammy": [ "linux/amd64", "linux/arm64" - ] + ] }, "variantTags": { + "11.0-preview-resolute": [ + "dotnet:${VERSION}-11.0-preview", + "dotnet:${VERSION}-11.0-preview-resolute" + ], "10.0-noble": [ "dotnet:${VERSION}-10.0", "dotnet:${VERSION}-10.0-noble" - ], + ], "9.0-bookworm-slim": [ "dotnet:${VERSION}-9.0", "dotnet:${VERSION}-9.0-bookworm" @@ -52,7 +61,7 @@ "8.0-bookworm-slim": [ "dotnet:${VERSION}-8.0", "dotnet:${VERSION}-8.0-bookworm" - ] + ] } }, "dependencies": {