Use dotnet-install.sh in .NET feature

src/dotnet/NOTES.md

@@ -1,4 +1,71 @@
+## Configuration examples
 
+Installing only the latest .NET SDK version (the default).
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": "latest" // or "" or {}
+}
+```
+
+Installing an additional SDK version. Multiple versions can be specified as comma-separated values.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "additionalVersions": "lts"
+    }
+}
+```
+
+Installing specific SDK versions.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0",
+        "additionalVersions": "7.0, 8.0"
+    }
+}
+```
+
+Installing a specific SDK feature band.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.4xx",
+    }
+}
+```
+
+Installing a specific SDK patch version.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "6.0.412",
+    }
+}
+```
+
+Installing only the .NET Runtime or the ASP.NET Core Runtime. Note that the SDK includes all runtimes so this configuration is only useful for users who need to run .NET apps without building them from source.
+
+``` json
+{
+"features": {
+    "ghcr.io/devcontainers/features/dotnet:2": {
+        "version": "none",
+        "dotnetRuntimeVersions": "latest, lts",
+        "aspnetCoreRuntimeVersions": "latest, lts",
+    }
+}
+```
 
 ## OS Support
 

src/dotnet/devcontainer-feature.json

@@ -10,6 +10,7 @@
             "proposals": [
                 "latest",
                 "lts",
+                "none",
                 "8.0",
                 "7.0",
                 "6.0"
@@ -21,6 +22,16 @@
             "type": "string",
             "default": "",
             "description": "Enter additional .NET SDK versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        },
+        "dotnetRuntimeVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional .NET runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        },
+        "aspNetCoreRuntimeVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Enter additional ASP.NET Core runtime versions, separated by commas. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         }
     },
     "containerEnv": {

src/dotnet/install.sh

@@ -6,11 +6,20 @@
 #
 # Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
 # Maintainer: The Dev Container spec maintainers
+DOTNET_VERSION="${VERSION:-"latest"}"
+ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
+DOTNET_RUNTIME_VERSIONS="${DOTNETRUNTIMEVERSIONS:-""}"
+ASPNETCORE_RUNTIME_VERSIONS="${ASPNETCORERUNTIMEVERSIONS:-""}"
+
 DOTNET_INSTALL_SCRIPT='scripts/vendor/dotnet-install.sh'
 DOTNET_INSTALL_DIR='/usr/share/dotnet'
 
 set -e
 
+source "scripts/install-dotnet-sdk.sh"
+source "scripts/install-dotnet-runtime.sh"
+source "scripts/install-aspnetcore-runtime.sh"
+
 # Clean up
 rm -rf /var/lib/apt/lists/*
 
@@ -34,128 +43,103 @@ check_packages() {
     fi
 }
 
-fetch_latest_sdk_version_in_channel() {
-    local channel="$1"
-    wget -qO- "https://dotnetcli.azureedge.net/dotnet/Sdk/$channel/latest.version"
-}
+# Removes leading and trailing whitespace from an input string
+trim_whitespace() {
+    text="$1"
 
-fetch_latest_sdk_version() {
-    local latest_STS=$(fetch_latest_sdk_version_in_channel "STS")
-    local latest_LTS=$(fetch_latest_sdk_version_in_channel "LTS")
-    if [[ "$latest_STS" > "$latest_LTS" ]]; then
-        echo "$latest_STS"
-    else
-        echo "$latest_LTS"
-    fi
-}
+    # Remove leading spaces
+    while [ "${text:0:1}" == " " ]; do
+        text="${text:1}"
+    done
 
-# Installs a version of .NET using the DOTNET_INSTALLER_SCRIPT
-install_version() {
-    local inputVersion="$1"
-
-    echo "Installing version '$inputVersion'..."
-
-    # Quick options reminder for dotnet-install.sh:
-    #
-    # --version: 'latest' (default) or an exact version in the form 'A.B.C' like '6.0.412'
-    # --channel: 'LTS' (default), 'STS', a two-part version in the form 'A.B' like '6.0' or three-part form 'A.B.Cxx' like '6.0.1xx'
-    # --quality: 'daily', 'signed', 'validated', 'preview' or 'GA'
-    #
-    # Valid examples
-    #
-    # dotnet-install.sh [--version latest] [--channel LTS]
-    # dotnet-install.sh [--version latest] --channel STS
-    # 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 6.0.412
-    #
-    # The channel option is only used when version is 'latest' because an exact version overrides the channel option
-    # The quality option is only used when channel is 'A.B' or 'A.B.Cxx' because it can't be used with STS or LTS
-    #
-    # This script aims to reduce these combinations of options to a single 'version' input
-    # Currently this script does not make it possible to request a version in the form 'A.B' or 'A.B.Cxx' and a quality other than 'GA'
-    local version=""
-    local channel=""
-    if [[ "$inputVersion" == "latest" ]]; then
-        # Fetch the latest version manually, because dotnet-install.sh does not support it directly
-        version=$(fetch_latest_sdk_version)
-        channel=""
-    elif [[ "$inputVersion" == "lts" ]]; then
-        # When user input is 'lts'
-        # Then version=latest, channel=LTS
-        version="latest"
-        channel="LTS"
-    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+$ ]]; then
-        # When user input is form 'A.B' like '3.1'
-        # Then version=latest, channel=3.1
-        version="latest"
-        channel="$inputVersion"
-    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+\.[0-9]xx$ ]]; then
-        # When user input is form 'A.B.Cxx' like '6.0.4xx'
-        # Then version=latest, channel=6.0.4xx
-        version="latest"
-        channel="$inputVersion"
-    else
-        # Assume version is an exact version string like '6.0.412' or '8.0.100-rc.1.23371.5''
-        version="$inputVersion"
-        channel=""
-    fi
+    # Remove trailing spaces
+    while [ "${text: -1}" == " " ]; do
+        text="${text:0:-1}"
+    done
 
-    echo "Executing $DOTNET_INSTALL_SCRIPT --install-dir $DOTNET_INSTALL_DIR --version $version --channel $channel --no-path"
-    "$DOTNET_INSTALL_SCRIPT" \
-        --install-dir "$DOTNET_INSTALL_DIR" \
-        --version "$version" \
-        --channel "$channel" \
-        --no-path
+    echo "$text"
 }
 
-# Splits comma-separated values into an array
+# Splits comma-separated values into an array while ignoring empty entries
 split_csv() {
-    local OLD_IFS=$IFS
-    IFS=","
-    read -a values <<< "$1"
-    IFS=$OLD_IFS
-    echo "${values[@]}"
-}
+    local -a values=()
+    while IFS="," read -ra entries; do
+        for entry in "${entries[@]}"; do
+            entry="$(trim_whitespace "$entry")"
+            if [ -n "$entry" ]; then
+                values+=("$entry")
+            fi
+        done
+    done <<< "$1"
 
-# Removes leading and trailing whitespace from an input string
-trim_whitespace() {
-    echo $1 | tr -d '[:space:]'
+    echo "${values[@]}"
 }
 
 if [ "$(id -u)" -ne 0 ]; then
     err 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
     exit 1
 fi
 
-# For our own convenience, combine VERSION and ADDITIONALVERSIONS into a single 'versions' array
+
+# For our own convenience, combine DOTNET_VERSION and ADDITIONAL_VERSIONS into a single 'versions' array
 # Ensure there are no leading or trailing spaces that can break regex pattern matching
-versions=($(trim_whitespace "$VERSION"))
-for additional_version in $(split_csv "$ADDITIONALVERSIONS"); do
-    versions+=($(trim_whitespace "$additional_version"))
+versions=("$(trim_whitespace "$DOTNET_VERSION")")
+for additional_version in $(split_csv "$ADDITIONAL_VERSIONS"); do
+    versions+=("$additional_version")
+done
+
+dotnetRuntimeVersions=()
+for dotnetRuntimeVersion in $(split_csv "$DOTNET_RUNTIME_VERSIONS"); do
+    dotnetRuntimeVersions+=("$dotnetRuntimeVersion")
+done
+
+aspNetCoreRuntimeVersions=()
+for aspNetCoreRuntimeVersion in $(split_csv "$ASPNETCORE_RUNTIME_VERSIONS"); do
+    aspNetCoreRuntimeVersions+=("$aspNetCoreRuntimeVersion")
 done
 
 # Fail fast in case of bad input to avoid unneccesary work
+# v1 of the .NET feature allowed specifying only a major version 'X' like '3'
+# v2 removed this ability
+# - because install-dotnet.sh does not support it directly
+# - because the previous behavior installed an old version like '3.0.103', not the newest version '3.1.426', which was counterintuitive
 for version in "${versions[@]}"; do
     if [[ "$version" =~ ^[0-9]+$ ]]; then
-        # v1 of the .NET feature allowed specifying only a major version 'X' like '3'
-        # v2 removed this ability
-        # - because install-dotnet.sh does not support it directly
-        # - because the previous behavior installed an old version like '3.0.103', not the newest version '3.1.426', which was counterintuitive
         err "Unsupported .NET SDK version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
         exit 1
     fi
 done
 
+for version in "${dotnetRuntimeVersions[@]}"; do
+    if [[ "$version" =~ ^[0-9]+$ ]]; then
+        err "Unsupported .NET Runtime version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        exit 1
+    fi
+done
+
+for version in "${aspNetCoreRuntimeVersions[@]}"; do
+    if [[ "$version" =~ ^[0-9]+$ ]]; then
+        err "Unsupported ASP.NET Core Runtime version '${version}'. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        exit 1
+    fi
+done
+
 # Install .NET versions and dependencies
 # icu-devtools includes dependencies for .NET
 check_packages wget ca-certificates icu-devtools
 
+if [ "${versions[0]}" != "none" ]; then
+    for version in "${versions[@]}"; do
+        install_dotnet_sdk "$version"
+    done
+fi
 
-for version in "${versions[@]}"; do
-    install_version $version
+for version in "${dotnetRuntimeVersions[@]}"; do
+    install_dotnet_runtime "$version"
+done
+
+for version in "${aspNetCoreRuntimeVersions[@]}"; do
+    install_aspnetcore_runtime "$version"
 done
 
 # Clean up

src/dotnet/scripts/install-aspnetcore-runtime.sh

@@ -0,0 +1,57 @@
+#!/bin/bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+# Docs: https://github.com/devcontainers/features/tree/main/src/dotnet
+# Maintainer: The Dev Container spec maintainers
+fetch_latest_aspnetcore_runtime_version_in_channel() {
+    local channel="$1"
+    wget -qO- "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/$channel/latest.version"
+}
+
+fetch_latest_aspnetcore_runtime_version() {
+    local sts_version
+    local lts_version
+    sts_version=$(fetch_latest_aspnetcore_runtime_version_in_channel "STS")
+    lts_version=$(fetch_latest_aspnetcore_runtime_version_in_channel "LTS")
+    if [[ "$sts_version" > "$lts_version" ]]; then
+        echo "$sts_version"
+    else
+        echo "$lts_version"
+    fi
+}
+
+install_aspnetcore_runtime() {
+    local inputVersion="$1"
+    local version=""
+    local channel=""
+    if [[ "$inputVersion" == "latest" ]]; then
+        # Fetch the latest version manually, because dotnet-install.sh does not support it directly
+        version=$(fetch_latest_aspnetcore_runtime_version)
+        channel=""
+    elif [[ "$inputVersion" == "lts" ]]; then
+        # When user input is 'lts'
+        # Then version=latest, channel=LTS
+        version="latest"
+        channel="LTS"
+    elif [[ "$inputVersion" =~ ^[0-9]+\.[0-9]+$ ]]; then
+        # When user input is form 'A.B' like '3.1'
+        # Then version=latest, channel=3.1
+        version="latest"
+        channel="$inputVersion"
+    else
+        # Assume version is an exact version string like '6.0.21' or '8.0.0-rc.2.23425.11'
+        version="$inputVersion"
+        channel=""
+    fi
+
+    echo "Executing $DOTNET_INSTALL_SCRIPT --runtime aspnetcore --version $version --channel $channel --install-dir $DOTNET_INSTALL_DIR --no-path"
+    "$DOTNET_INSTALL_SCRIPT" \
+        --runtime aspnetcore \
+        --version "$version" \
+        --channel "$channel" \
+        --install-dir "$DOTNET_INSTALL_DIR" \
+        --no-path
+}