From 93363b06d6ece56d3bd740c1aba0114cef0dae94 Mon Sep 17 00:00:00 2001 From: Lilian Kasem Date: Thu, 24 Apr 2025 10:55:46 -0700 Subject: [PATCH] Update pwsh runtimes for linux --- build/Settings.cs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/build/Settings.cs b/build/Settings.cs index 6a04af978..a992c3d7a 100644 --- a/build/Settings.cs +++ b/build/Settings.cs @@ -93,11 +93,18 @@ private static string config(string @default = null, [CallerMemberName] string k { "linux", "linux-x64", - "linux-arm64", "unix", "linux-musl-x64" }; + private static readonly string[] _linARMPowershellRuntimes = new[] + { + "linux", + "linux-arm", + "linux-arm64", + "unix" + }; + private static readonly string[] _osxPowershellRuntimes = new[] { "osx", @@ -120,7 +127,7 @@ private static Dictionary GetPowerShell72Runtimes() { "win-x64", _winPowershellRuntimes }, { "win-arm64", _winPowershellRuntimes }, { "linux-x64", _linPowershellRuntimes }, - { "linux-arm64", _linPowershellRuntimes }, + { "linux-arm64", _linARMPowershellRuntimes }, { "osx-x64", _osxPowershellRuntimes }, { "osx-arm64", _osxARMPowershellRuntimes } }; @@ -135,7 +142,7 @@ private static Dictionary GetPowerShell74Runtimes() { "win-x64", _winPowershellRuntimesNet8 }, { "win-arm64", _winPowershellRuntimesNet8 }, { "linux-x64", _linPowershellRuntimes }, - { "linux-arm64", _linPowershellRuntimes }, + { "linux-arm64", _linARMPowershellRuntimes }, { "osx-x64", _osxPowershellRuntimes }, { "osx-arm64", _osxARMPowershellRuntimes } }; @@ -153,12 +160,12 @@ private static Dictionary GetPowerShell74Runtimes() { "win-x64", _winPowershellRuntimes }, { "win-arm64", _winPowershellRuntimes }, { "linux-x64", _linPowershellRuntimes }, - { "linux-arm64", _linPowershellRuntimes }, { "osx-x64", _osxPowershellRuntimes }, // NOTE: PowerShell 7.0 does not support arm. First version supporting it is 7.2 // https://docs.microsoft.com/en-us/powershell/scripting/install/installing-powershell-on-macos?view=powershell-7.2#supported-versions // That being said, we might as well include "osx" and "unix" since it'll hardly affect package size and should lead to more accurate error messages - { "osx-arm64", new [] { "osx", "unix" } } + { "osx-arm64", new [] { "osx", "unix" } }, + { "linux-arm64", new [] { "linux", "unix" } } } }, {