Merge branch 'main' into feature/pre-commit-hook_support_1138

gvatsal60 · web-flow · commit 0e4de77b8070 · 2025-06-15T11:13:38.000+05:30
diff --git a/src/docker-outside-of-docker/devcontainer-feature.json b/src/docker-outside-of-docker/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "docker-outside-of-docker",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "name": "Docker (docker-outside-of-docker)",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",
     "description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",
diff --git a/src/docker-outside-of-docker/install.sh b/src/docker-outside-of-docker/install.sh
@@ -20,8 +20,8 @@ INSTALL_DOCKER_BUILDX="${INSTALLDOCKERBUILDX:-"true"}"
 INSTALL_DOCKER_COMPOSE_SWITCH="${INSTALLDOCKERCOMPOSESWITCH:-"true"}"
 
 MICROSOFT_GPG_KEYS_URI="https://packages.microsoft.com/keys/microsoft.asc"
-DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble"
-DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble"
+DOCKER_MOBY_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal jammy noble plucky"
+DOCKER_LICENSED_ARCHIVE_VERSION_CODENAMES="bookworm buster bullseye bionic focal hirsute impish jammy noble plucky"
 
 set -e
 
diff --git a/src/dotnet/devcontainer-feature.json b/src/dotnet/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "dotnet",
-    "version": "2.2.1",
+    "version": "2.3.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "This Feature installs the latest .NET SDK, which includes the .NET CLI and the shared runtime. Options are provided to choose a different version or additional versions.",
@@ -11,6 +11,7 @@
                 "latest",
                 "lts",
                 "none",
+                "10.0-preview",
                 "8.0",
                 "7.0",
                 "6.0"
diff --git a/src/dotnet/install.sh b/src/dotnet/install.sh
@@ -108,7 +108,9 @@ done
 check_packages wget ca-certificates icu-devtools
 
 for version in "${versions[@]}"; do
-    install_sdk "$version"
+    # Remove '-preview' from version if suffixed with the version label
+    clean_version="$(echo "$version" | sed 's/-preview$//')"
+    install_sdk "$clean_version"
 done
 
 for version in "${dotnetRuntimeVersions[@]}"; do
diff --git a/src/dotnet/scripts/vendor/README.md b/src/dotnet/scripts/vendor/README.md
@@ -23,5 +23,6 @@ dotnet-install.sh [--version latest] --channel 6.0 [--quality GA]
 dotnet-install.sh [--version latest] --channel 6.0.4xx [--quality GA]
 dotnet-install.sh [--version latest] --channel 8.0 --quality preview
 dotnet-install.sh [--version latest] --channel 8.0 --quality daily
+dotnet-install.sh [--version latest] --channel 10.0 --quality preview
 dotnet-install.sh --version 6.0.413
 ```
diff --git a/src/node/devcontainer-feature.json b/src/node/devcontainer-feature.json
@@ -1,6 +1,6 @@
 {
     "id": "node",
-    "version": "1.6.2",
+    "version": "1.6.3",
     "name": "Node.js (via nvm), yarn and pnpm",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/node",
     "description": "Installs Node.js, nvm, yarn, pnpm, and needed dependencies.",
@@ -11,9 +11,8 @@
                 "lts",
                 "latest",
                 "none",
-                "18",
-                "16",
-                "14"
+                "22",
+                "20"
             ],
             "default": "lts",
             "description": "Select or enter a Node.js version to install"
diff --git a/test/dotnet/install_dotnet_multiple_versions.sh b/test/dotnet/install_dotnet_multiple_versions.sh
@@ -22,14 +22,8 @@ is_dotnet_sdk_version_installed "8.0"
 check ".NET SDK 7.0 installed" \
 is_dotnet_sdk_version_installed "7.0"
 
-check ".NET SDK 6.0 installed" \
-is_dotnet_sdk_version_installed "6.0"
-
-check ".NET SDK 5.0 installed" \
-is_dotnet_sdk_version_installed "5.0"
-
-check ".NET Core SDK 3.1 installed" \
-is_dotnet_sdk_version_installed "3.1"
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
 
 check "Build example class library" \
 dotnet build projects/multitargeting
@@ -43,14 +37,8 @@ dotnet run --project projects/net8.0
 check "Build and run .NET 7.0 project" \
 dotnet run --project projects/net7.0
 
-check "Build and run .NET 6.0 project" \
-dotnet run --project projects/net6.0
-
-check "Build and run .NET 5.0 project" \
-dotnet run --project projects/net5.0
-
-check "Build and run .NET Core 3.1 project" \
-dotnet run --project projects/netcoreapp3.1
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_multiple_versions_preview.sh b/test/dotnet/install_dotnet_multiple_versions_preview.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library bundled with the devcontainer CLI
+# See https://github.com/devcontainers/cli/blob/HEAD/docs/features/test.md#dev-container-features-test-lib
+# Provides the 'check' and 'reportResults' commands.
+source dev-container-features-test-lib
+
+# Feature-specific tests
+# The 'check' command comes from the dev-container-features-test-lib. Syntax is...
+# check <LABEL> <cmd> [args...]
+source dotnet_env.sh
+source dotnet_helpers.sh
+
+check ".NET SDK 9.0 installed" \
+is_dotnet_sdk_version_installed "9.0"
+
+check ".NET SDK 8.0 installed" \
+is_dotnet_sdk_version_installed "8.0"
+
+check ".NET SDK 7.0 installed" \
+is_dotnet_sdk_version_installed "7.0"
+
+check ".NET SDK 10.0 installed" \
+is_dotnet_sdk_version_installed "10.0"
+
+check "Build example class library" \
+dotnet build projects/multitargeting
+
+check "Build and run .NET 9.0 project" \
+dotnet run --project projects/net9.0
+
+check "Build and run .NET 8.0 project" \
+dotnet run --project projects/net8.0
+
+check "Build and run .NET 7.0 project" \
+dotnet run --project projects/net7.0
+
+check "Build and run .NET 10.0 project" \
+dotnet run --project projects/net10.0
+
+# Report results
+# If any of the checks above exited with a non-zero exit code, the test will fail.
+reportResults
+
+
diff --git a/test/dotnet/install_dotnet_specific_release.sh b/test/dotnet/install_dotnet_specific_release.sh
@@ -13,13 +13,13 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-expected=$(fetch_latest_version_in_channel "3.1")
+expected=$(fetch_latest_version_in_channel "8.0")
 
-check ".NET Core SDK 3.1 installed" \
+check ".NET Core SDK 8.0 installed" \
 is_dotnet_sdk_version_installed "$expected"
 
 check "Build and run example project" \
-dotnet run --project projects/netcoreapp3.1 
+dotnet run --project projects/net8.0 
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/install_dotnet_specific_release_and_feature_band.sh b/test/dotnet/install_dotnet_specific_release_and_feature_band.sh
@@ -13,11 +13,11 @@ source dev-container-features-test-lib
 source dotnet_env.sh
 source dotnet_helpers.sh
 
-check ".NET SDK 5.0.3xx installed" \
-is_dotnet_sdk_version_installed "5.0.3"
+check ".NET SDK 8.0.3xx installed" \
+is_dotnet_sdk_version_installed "8.0.3"
 
 check "Build and run example project" \
-dotnet run --project projects/net5.0 
+dotnet run --project projects/net8.0 
 
 # Report results
 # If any of the checks above exited with a non-zero exit code, the test will fail.
diff --git a/test/dotnet/projects/net10.0/Program.cs b/test/dotnet/projects/net10.0/Program.cs
@@ -0,0 +1,32 @@
+﻿using Newtonsoft.Json;
+
+string json = """
+{
+  "Name": "Inception",
+  "ReleaseDate": "2010-07-08T00:00:00",
+  "Genres": [
+    "Action",
+    "Thriller"
+  ]
+}
+""";
+
+Movie? m = JsonConvert.DeserializeObject<Movie>(json);
+
+if (m == default)
+{
+    Console.WriteLine("Decoding failed!");
+}
+else
+{
+    Console.WriteLine($"Movie name: {m.Name}");
+    Console.WriteLine($"Release Date: {m.ReleaseDate}");
+    Console.WriteLine($"Genres: {string.Join(", ", m.Genres)}");
+}
+
+class Movie(string? name, DateTime releaseDate, List<string>? genres)
+{
+    public string Name { get; set; } = name ?? "Default Name";
+    public DateTime ReleaseDate { get; set; } = releaseDate;
+    public List<string> Genres { get; set; } = genres ?? [];
+}
diff --git a/test/dotnet/projects/net10.0/example_project.csproj b/test/dotnet/projects/net10.0/example_project.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net10.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/dotnet/scenarios.json b/test/dotnet/scenarios.json
@@ -9,20 +9,20 @@
         }
     },
     "install_dotnet_specific_release": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "3.1"
+                "version": "8.0"
             }
         }
     },
     "install_dotnet_specific_release_and_feature_band": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-20.04",
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-24.04",
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "5.0.3xx"
+                "version": "8.0.3xx"
             }
         }
     },
@@ -40,17 +40,29 @@
         "remoteUser": "vscode",
         "features": {
             "dotnet": {
-                "version": "9.0",
+                "version": "10.0-preview",
                 "additionalVersions": [
+                    "9.0",
                     "8.0",
-                    "7.0",
-                    "6.0",
-                    "5.0",
-                    "3.1"
+                    "7.0"
                 ]
             }
         }
     },
+    "install_dotnet_multiple_versions_preview": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
+        "remoteUser": "vscode",
+        "features": {
+            "dotnet": {
+                "version": "9.0",
+                "additionalVersions": [
+                    "10.0-preview",
+                    "8.0",
+                    "7.0"
+                ]
+            }
+        }
+    },    
     "install_dotnet_global_tool": {
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "remoteUser": "vscode",
diff --git a/test/node/install_additional_node.sh b/test/node/install_additional_node.sh
@@ -5,13 +5,12 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# 'lts' is now some version of node 20...
-check "version_on_path"  node -v | grep 20
+# 'lts' is now some version of node 22...
+check "version_on_path"  node -v | grep 22
 check "pnpm" bash -c "pnpm -v | grep 8.8.0"
 
-check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
-check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
-check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
+check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
 
 
 # Report result
diff --git a/test/node/install_additional_node_on_rhel_family.sh b/test/node/install_additional_node_on_rhel_family.sh
@@ -5,13 +5,13 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-# 'lts' is now some version of node 20...
-check "version_on_path"  node -v | grep 20
+# 'lts' is now some version of node 22...
+check "version_on_path"  node -v | grep 22
 check "pnpm" bash -c "pnpm -v | grep 6.16.0"
 
 check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20
-check "v14_installed" ls -1 /usr/local/share/nvm/versions/node | grep 14.19.3
-check "v17_installed" ls -1 /usr/local/share/nvm/versions/node | grep 17.9.1
+check "v19_installed" ls -1 /usr/local/share/nvm/versions/node | grep 19.9.0
+check "v20_installed" ls -1 /usr/local/share/nvm/versions/node | grep 20.19.1
 
 
 # Report result
diff --git a/test/node/install_node_22_on_jammy.sh b/test/node/install_node_22_on_jammy.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+# Definition specific tests
+check "version" bash -c "node --version | grep 22"
+check "pnpm" bash -c "pnpm -v | grep 8.8.0"
+check "nvm" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 10"
+
+# Report result
+reportResults
+
diff --git a/test/node/scenarios.json b/test/node/scenarios.json
@@ -6,13 +6,13 @@
                 "version": "lts"
             }
         }
-    },
+    },    
     "install_additional_node": {
         "image": "debian:11",
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3",
+                "additionalVersions": "v20.19.1,v19.9.0",
                 "pnpmVersion": "8.8.0"
             }
         }
@@ -22,7 +22,7 @@
         "features": {
             "node": {
                 "version": "lts",
-                "additionalVersions": "v17.9.1,v14.19.3",
+                "additionalVersions": "v20.19.1,v19.9.0",
                 "pnpmVersion": "6.16.0"
             }
         }
@@ -77,11 +77,11 @@
             }
         }
     },
-    "install_node_16_on_bionic": {
-        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-18.04",
+    "install_node_22_on_jammy": {
+        "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
         "features": {
             "node": {
-                "version": "16",
+                "version": "22",
                 "pnpmVersion":"8.8.0"
             }
         }
@@ -200,4 +200,4 @@
             }
         }
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "docker-outside-of-docker",`
`3`		`- "version": "1.6.2",`
	`3`	`+ "version": "1.6.3",`
`4`	`4`	`"name": "Docker (docker-outside-of-docker)",`
`5`	`5`	`"documentationURL": "https://github.com/devcontainers/features/tree/main/src/docker-outside-of-docker",`
`6`	`6`	`"description": "Re-use the host docker socket, adding the Docker CLI to a container. Feature invokes a script to enable using a forwarded Docker socket within a container to run Docker commands.",`