Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dotnet-fsharp/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-fsharp/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-mssql/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-mssql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
9 changes: 4 additions & 5 deletions src/dotnet-mssql/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-postgres/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-postgres/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
9 changes: 4 additions & 5 deletions src/dotnet-postgres/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {},
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
9 changes: 4 additions & 5 deletions src/dotnet/devcontainer-template.json
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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": [
Expand Down
3 changes: 2 additions & 1 deletion test/dotnet-mssql/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion test/dotnet-postgres/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down