Update packages and remove netcoreapp3.1 tests

Since .NET Core 3.1 is out of support, testing for it makes little sense. GW2SDK can still be installed in any .NET version but the tests now only target supported versions.
sliekens · Aug 6, 2023 · f282dc0 · f282dc0
1 parent 448afc9
commit f282dc0
Show file tree

Hide file tree

Showing 17 changed files with 1,954 additions and 1,469 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -7,7 +7,9 @@
   "features": {
     "./dotnet": {
       "version": "7.0",
-      "additionalVersions": "3.1,5.0,6.0"
+      "additionalVersions": [
+        "6.0"
+      ]
     },
     "./mono": {},
     "ghcr.io/devcontainers/features/node:1": {},

diff --git a/.devcontainer/dotnet/devcontainer-feature.json b/.devcontainer/dotnet/devcontainer-feature.json
@@ -1,40 +1,42 @@
 {
-  "id": "dotnet",
-  "version": "2.0.0",
-  "name": "Dotnet CLI",
-  "documentationURL": "https://github.com/devcontainers/features/tree/main/src/dotnet",
-  "description": "Installs .NET SDK, which includes the .NET CLI and the shared runtime. Offers options to install multiple SDK versions.",
-  "options": {
-      "version": {
-          "type": "string",
-          "proposals": [
-              "latest",
-              "lts",
-              "8.0",
-              "7.0",
-              "6.0"
-          ],
-          "default": "latest",
-          "description": "Version of .NET SDK to install. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
-      },
-      "additionalVersions": {
-          "type": "string",
-          "default": "",
-          "description": "Comma-separated list of additional .NET SDK versions to install. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
-      }
-  },
-  "containerEnv": {
-      "DOTNET_ROOT": "/usr/share/dotnet",
-      "PATH": "$PATH:$DOTNET_ROOT:~/.dotnet/tools"
-  },
-  "customizations": {
-      "vscode": {
-          "extensions": [
-              "ms-dotnettools.csharp"
-          ]
-      }
-  },
-  "installsAfter": [
-      "ghcr.io/devcontainers/features/common-utils"
-  ]
-}
+    "id": "dotnet",
+    "version": "2.0.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.",
+    "options": {
+        "version": {
+            "type": "string",
+            "proposals": [
+                "latest",
+                "lts",
+                "8.0",
+                "7.0",
+                "6.0"
+            ],
+            "default": "latest",
+            "description": "Select or enter a .NET SDK version. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        },
+        "additionalVersions": {
+            "type": "string",
+            "default": "",
+            "description": "Select or enter additional .NET SDK versions, multiple versions can be separated by commas or entered as a JSON array. Use 'latest' for the latest version, 'lts' for the latest LTS version, 'X.Y' or 'X.Y.Z' for a specific version."
+        }
+    },
+    "containerEnv": {
+        "DOTNET_ROOT": "/usr/share/dotnet",
+        "PATH": "$PATH:$DOTNET_ROOT:~/.dotnet/tools",
+        "DOTNET_RUNNING_IN_CONTAINER": "true",
+        "DOTNET_USE_POLLING_FILE_WATCHER": "true"
+    },
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "ms-dotnettools.csharp"
+            ]
+        }
+    },
+    "installsAfter": [
+        "ghcr.io/devcontainers/features/common-utils"
+    ]
+}
diff --git a/.devcontainer/dotnet/install.sh b/.devcontainer/dotnet/install.sh
@@ -9,8 +9,7 @@
 DOTNET_VERSION="${VERSION:-"latest"}"
 DOTNET_ADDITIONAL_VERSIONS="${ADDITIONALVERSIONS:-""}"
 
-DOTNET_INSTALL_SCRIPT_URL='https://dot.net/v1/dotnet-install.sh'
-DOTNET_INSTALL_SCRIPT='/tmp/dotnet-install.sh'
+DOTNET_INSTALL_SCRIPT='scripts/dotnet-install.sh'
 DOTNET_INSTALL_DIR='/usr/share/dotnet'
 
 set -e
@@ -155,15 +154,13 @@ done
 # icu-devtools includes dependencies for .NET
 check_packages wget ca-certificates icu-devtools
 
-wget -O "$DOTNET_INSTALL_SCRIPT" "$DOTNET_INSTALL_SCRIPT_URL"
-chmod +x "$DOTNET_INSTALL_SCRIPT"
 
 for version in "${versions[@]}"; do
     install_version $version
 done
 
 # Clean up
 rm -rf /var/lib/apt/lists/*
-rm "$DOTNET_INSTALL_SCRIPT"
+rm -rf scripts
 
 echo "Done!"