Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions build/Settings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -120,7 +127,7 @@ private static Dictionary<string, string[]> GetPowerShell72Runtimes()
{ "win-x64", _winPowershellRuntimes },
{ "win-arm64", _winPowershellRuntimes },
{ "linux-x64", _linPowershellRuntimes },
{ "linux-arm64", _linPowershellRuntimes },
{ "linux-arm64", _linARMPowershellRuntimes },
{ "osx-x64", _osxPowershellRuntimes },
{ "osx-arm64", _osxARMPowershellRuntimes }
};
Expand All @@ -135,7 +142,7 @@ private static Dictionary<string, string[]> GetPowerShell74Runtimes()
{ "win-x64", _winPowershellRuntimesNet8 },
{ "win-arm64", _winPowershellRuntimesNet8 },
{ "linux-x64", _linPowershellRuntimes },
{ "linux-arm64", _linPowershellRuntimes },
{ "linux-arm64", _linARMPowershellRuntimes },
{ "osx-x64", _osxPowershellRuntimes },
{ "osx-arm64", _osxARMPowershellRuntimes }
};
Expand All @@ -153,12 +160,12 @@ private static Dictionary<string, string[]> 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" } }
}
},
{
Expand Down