From 437a43135078a4f628434a6eeb7e15c35c8b4bbf Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Mon, 14 Apr 2025 11:33:17 +0200 Subject: [PATCH] Refactored RIDs & .NET version --- app/Build/Tools/Environment.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Build/Tools/Environment.cs b/app/Build/Tools/Environment.cs index 0729636d..9776b633 100644 --- a/app/Build/Tools/Environment.cs +++ b/app/Build/Tools/Environment.cs @@ -7,7 +7,7 @@ public static class Environment public const string DOTNET_VERSION = "net9.0"; public static readonly Encoding UTF8_NO_BOM = new UTF8Encoding(false); - private static readonly string[] ALL_RIDS = ["win-x64", "win-arm64", "linux-x64", "linux-arm64", "osx-arm64", "osx-x64"]; + private static readonly Dictionary ALL_RIDS = Enum.GetValues().Select(rid => new KeyValuePair(rid, rid.ToName())).ToDictionary(kvp => kvp.Key, kvp => kvp.Value); public static bool IsWorkingDirectoryValid() { @@ -60,16 +60,16 @@ public static class Environment return null; } - public static IEnumerable GetRidsForCurrentOS() + public static IEnumerable GetRidsForCurrentOS() { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - return ALL_RIDS.Where(rid => rid.StartsWith("win-", StringComparison.OrdinalIgnoreCase)); + return ALL_RIDS.Where(rid => rid.Value.StartsWith("win-", StringComparison.Ordinal)).Select(n => n.Key); if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) - return ALL_RIDS.Where(rid => rid.StartsWith("osx-", StringComparison.OrdinalIgnoreCase)); + return ALL_RIDS.Where(rid => rid.Value.StartsWith("osx-", StringComparison.Ordinal)).Select(n => n.Key); if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) - return ALL_RIDS.Where(rid => rid.StartsWith("linux-", StringComparison.OrdinalIgnoreCase)); + return ALL_RIDS.Where(rid => rid.Value.StartsWith("linux-", StringComparison.Ordinal)).Select(n => n.Key); Console.WriteLine($"Error: Unsupported OS '{RuntimeInformation.OSDescription}'"); return [];