Merge pull request #4 from dotnet/9.1

Update to 9.1

Author: danmoseley

.gitattributes

@@ -0,0 +1,3 @@
+* text=auto
+*.sh text eol=lf
+*.txt text eol=lf

.github/workflows/test.yaml

@@ -13,8 +13,7 @@ jobs:
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - dotnetaspire
         baseImage:
           - debian:latest
           - ubuntu:latest
@@ -34,8 +33,7 @@ jobs:
     strategy:
       matrix:
         features:
-          - color
-          - hello
+          - dotnetaspire
     steps:
       - uses: actions/checkout@v4
 

src/dotnetaspire/README.md

@@ -15,7 +15,7 @@ Installs .NET Aspire. See https://aka.ms/dotnetaspire
 
 | Options Id | Description | Type | Default Value |
 |-----|-----|-----|-----|
-| version | Select or enter a .NET Aspire version. Use 'latest' for the latest supported version, '9.0' for the 9.0 version, 'X.Y' or 'X.Y.Z' for a specific version, or 'latest-daily' for the latest unsupported build. | string | 9.0 |
+| version | Select or enter a .NET Aspire version. Use 'latest' for the latest supported version, '9.1' for the 9.1 version, 'X.Y' or 'X.Y.Z' for a specific version, or 'latest-daily' for the latest unsupported build. | string | 9.1 |
 
 ## Customizations
 

src/dotnetaspire/devcontainer-feature.json

@@ -10,10 +10,10 @@
             "proposals": [
                 "latest daily",
                 "latest",
-                "9.0",
+                "9.1",
             ],
-            "default": "9.0",
-            "description": "Select or enter a .NET Aspire version. Use 'latest' for the latest supported version, '9.0' for the 9.0 version, 'X.Y' or 'X.Y.Z' for a specific version, or 'latest-daily' for the latest unsupported build."
+            "default": "9.1",
+            "description": "Select or enter a .NET Aspire version. Use 'latest' for the latest supported version, '9.1' for the 9.1 version, 'X.Y' or 'X.Y.Z' for a specific version, or 'latest-daily' for the latest unsupported build."
         },
     },
     "customizations": {

src/dotnetaspire/install.sh

@@ -13,23 +13,23 @@ set -e
 # default to latest if not specified
 VERSION="${VERSION:-"latest"}"
 
-if [[ ! $VERSION =~ ^(9\.0|latest|latest-daily)$ ]]; then
-    echo "Error: VERSION must be either '9.0', '9.0.0', 'latest', or 'latest-daily' not: '$VERSION'."
+if [[ ! $VERSION =~ ^(9\.1|latest|latest-daily)$ ]]; then
+    echo "Error: VERSION must be either '9.1', '9.1.0', 'latest', or 'latest-daily' not: '$VERSION'."
     exit 1
 fi
 
-if [[ $VERSION =~ ^(9\.0|9\.0\.0|latest)$ ]]; then
-    VERSION="9.0.0"
+if [[ $VERSION =~ ^(9\.1|9\.1\.0|latest)$ ]]; then
+    VERSION="9.1.0"
 fi
 
 echo "Activating feature '.NET Aspire' version: $VERSION"
 
-# Before .NET Aspire 9.0 install required `dotnet workload`: this is no longer necessary, as Aspire is 
+# Before .NET Aspire 9.1 install required `dotnet workload`: this is no longer necessary, as Aspire is 
 # installed when restoring Aspire projects. It's only necessary to install the appropriate version of the templates.
 
 
-if [[ $VERSION =~ ^(9\.0\.0)$ ]]; then
-    dotnet new install Aspire.ProjectTemplates::$VERSION
+if [[ $VERSION =~ ^(9\.1\.0)$ ]]; then
+    dotnet new install --force Aspire.ProjectTemplates::$VERSION
 else
     # https://github.com/dotnet/aspire/blob/main/docs/using-latest-daily.md
     dotnet nuget add source --name dotnet9 https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json

test/dotnetaspire/scenarios.json

@@ -3,7 +3,7 @@
         "image": "mcr.microsoft.com/devcontainers/base:ubuntu",
         "features": {
             "dotnetaspire": {
-                "version": "9.0"
+                "version": "9.1"
             }
         }
     },