From 84fb8b032e0b0b0b106d32c228fb36995f1c29c6 Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 24 May 2024 13:36:57 -0600 Subject: [PATCH] update to latest .net 9 preview sdk --- .devcontainer/devcontainer.json | 2 +- build-and-test.ps1 | 8 +++++--- global.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c7a84bab..67162ccb 100644 --- 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 index 9ecb9730..ad0193b0 100755 --- 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 index dd89862a..25ff557c 100644 --- 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" } } \ No newline at end of file