update to latest .net 9 preview sdk

ixmilia · May 24, 2024 · 84fb8b0 · 84fb8b0
1 parent b3412e2
commit 84fb8b0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -5,7 +5,7 @@
   },
   "features": {
     "ghcr.io/devcontainers/features/dotnet:2": {
-      "version": "9.0",
+      "version": "9.0.100-preview.4.24267.66",
       "additionalVersions": "7.0"
     },
     "ghcr.io/devcontainers/features/go:1": {

diff --git a/build-and-test.ps1 b/build-and-test.ps1
@@ -50,9 +50,11 @@ try {
     npm i
     if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
     if ($IsLinux -And $architecture -eq "arm64") {
-        # when cross-compiling for linux arm64, we specifically need the x64 version of icon-gen
-        npm install --platform=linux --arch=x64 icon-gen
-        if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        # when cross-compiling for linux arm64, we specifically need the x64 version of icon-gen and sharp
+        foreach ($package in @("icon-gen", "sharp")) {
+            npm install --platform=linux --arch=x64 $package
+            if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+        }
     }
     npm run compile
     if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.100-preview.3.24204.13",
+    "version": "9.0.100-preview.4.24267.66",
     "rollForward": "latestMinor"
   }
 }