Add .NET 7, drop .NET 5 (#269)

* Add .NET 7, drop .NET 5

* Add libssl3 to common-utils for jammy

* Handle lts/latest hard coding

* Fix, improve tests

* Bump version

* Fix situation where version could come from either MS repo or OS

* Remove unused option

* Bump common version

* Remove unused function

* Restore DOTNET_ROOT per feedback

src/common-utils/devcontainer-feature.json

 {
     "id": "common-utils",
-    "version": "1.1.3",
+    "version": "1.1.4",
     "name": "Common Debian Utilities",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/common-utils",
     "description": "Installs a set of common command line utilities, Oh My Zsh!, and sets up a non-root user.",

src/common-utils/install.sh

@@ -140,7 +140,12 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
     if [[ ! -z $(apt-cache --names-only search ^libssl1.1$) ]]; then
         package_list="${package_list}       libssl1.1"
     fi
-    
+
+    # Install libssl3 if available
+    if [[ ! -z $(apt-cache --names-only search ^libssl3$) ]]; then
+        package_list="${package_list}       libssl3"
+    fi
+
     # Install appropriate version of libssl1.0.x if available
     libssl_package=$(dpkg-query -f '${db:Status-Abbrev}\t${binary:Package}\n' -W 'libssl1\.0\.?' 2>&1 || echo '')
     if [ "$(echo "$LIlibssl_packageBSSL" | grep -o 'libssl1\.0\.[0-9]:' | uniq | sort | wc -l)" -eq 0 ]; then

src/dotnet/devcontainer-feature.json

 {
     "id": "dotnet",
-    "version": "1.0.8",
+    "version": "1.1.0",
     "name": "Dotnet CLI",
     "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
     "description": "Installs the .NET CLI. Provides option of installing sdk or runtime, and option of versions to install. Uses latest version of .NET sdk as defaults to install.",
@@ -9,8 +9,8 @@
             "type": "string",
             "proposals": [
                 "latest",
+                "7",
                 "6",
-                "5",
                 "3.1"
             ],
             "default": "latest",

test/dotnet/install_additional_dotnet.sh

@@ -5,9 +5,13 @@ set -e
 # Optional: Import test library
 source dev-container-features-test-lib
 
-check "dotnet version 6.0.301 installed as default" dotnet --version | grep 6.0.301
-check "dotnet version 5.0 installed"  ls -l /usr/local/dotnet | grep 5.0
-check "dotnet version 3.1.420 installed"  ls -l /usr/local/dotnet | grep 3.1.420
+check "dotnet version 6.0.301 installed as default" bash -c "dotnet --version | grep 6.0.301"
+check "dotnet version 5.0 installed"  bash -c "ls -l /usr/local/dotnet | grep 5.0"
+check "dotnet version 3.1.420 installed"  bash -c "ls -l /usr/local/dotnet | grep 3.1.420"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults

test/dotnet/install_dotnet_3.sh

@@ -6,8 +6,12 @@ set -e
 source dev-container-features-test-lib
 
 check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 3 is installed" dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'
-check "dotnet version 3 installed"  ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'
+check "some major version of dotnet 3 is installed" bash -c "dotnet --list-sdks |  grep '3\.[0-9]*\.[0-9]*'"
+check "dotnet version 3 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '3\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults

test/dotnet/install_dotnet_6_bullseye.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_6_focal.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_7_bullseye.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_7_jammy.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_latest.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_lts.sh

+#!/bin/bash
+
+set -e
+
+# Optional: Import test library
+source dev-container-features-test-lib
+
+check "dotnet sdks" dotnet --list-sdks
+check "some major version of dotnet 6 is installed" bash -c "dotnet --list-sdks |  grep '6\.[0-9]*\.[0-9]*'"
+check "dotnet version 6 installed"  bash -c "ls -l /usr/share/dotnet/sdk | grep '6\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
+
+# Report result
+reportResults

test/dotnet/install_dotnet_5.sh → test/dotnet/install_wo_apt.sh

@@ -6,9 +6,12 @@ set -e
 source dev-container-features-test-lib
 
 check "dotnet sdks" dotnet --list-sdks
-check "some major version of dotnet 5 is installed" dotnet --list-sdks |  grep '5\.[0-9]*\.[0-9]*'
-check "dotnet version 5 installed"  ls -l /usr/share/dotnet/sdk | grep '5\.[0-9]*\.[0-9]*'
+check "some major version of dotnet 7 is installed" bash -c "dotnet --list-sdks |  grep '7\.[0-9]*\.[0-9]*'"
+check "dotnet version 7 installed"  bash -c "ls -l /usr/local/dotnet | grep '7\.[0-9]*\.[0-9]*'"
 
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults

test/dotnet/scenarios.json

@@ -16,11 +16,60 @@
             }
         }
     },
-    "install_dotnet_5": {
+    "install_dotnet_6_bullseye": {
+        "image": "debian:bullseye",
+        "features": {
+            "dotnet": {
+                "version": "6"
+            }
+        }
+    },
+    "install_dotnet_6_focal": {
         "image": "ubuntu:focal",
         "features": {
             "dotnet": {
-                "version": "5"
+                "version": "6"
+            }
+        }
+    },
+    "install_dotnet_7_bullseye": {
+        "image": "debian:bullseye",
+        "features": {
+            "dotnet": {
+                "version": "7"
+            }
+        }
+    },
+    "install_dotnet_7_jammy": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "7"
+            }
+        }
+    },
+    "install_dotnet_latest": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "latest"
+            }
+        }
+    },
+    "install_dotnet_lts": {
+        "image": "ubuntu:focal",
+        "features": {
+            "dotnet": {
+                "version": "lts"
+            }
+        }
+    },
+    "install_wo_apt": {
+        "image": "ubuntu:jammy",
+        "features": {
+            "dotnet": {
+                "version": "7",
+                "installUsingApt": false
             }
         }
     }

test/dotnet/test.sh

@@ -11,7 +11,11 @@ check "sdks" dotnet --list-sdks
 check "version" dotnet --version
 
 echo "Validating expected version present..."
-check "some major version of dotnet 6 is installed" dotnet --version |  grep '6\.[0-9]*\.[0-9]*'
+check "some major version of dotnet 7 is installed" bash -c "dotnet --version |  grep '7\.[0-9]*\.[0-9]*'"
+
+# Verify current symlink exists and works
+check "current link dotnet" /usr/local/dotnet/current/dotnet --info
+check "current link sdk" ls -l /usr/local/dotnet/current/sdk
 
 # Report result
 reportResults
\ No newline at end of file