From f1b5b9e350c71256b99ccd29b3f5a81806f790b1 Mon Sep 17 00:00:00 2001 From: Thorsten Sommer Date: Mon, 14 Apr 2025 11:32:41 +0200 Subject: [PATCH] Refactored RIDs & .NET version --- app/Build/Commands/UpdateWebAssetsCommand.cs | 4 +++- app/Build/Tools/Environment.cs | 1 + app/Build/Tools/RID.cs | 15 +++++++++++++++ app/Build/Tools/RIDExtensions.cs | 18 ++++++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 app/Build/Tools/RID.cs create mode 100644 app/Build/Tools/RIDExtensions.cs diff --git a/app/Build/Commands/UpdateWebAssetsCommand.cs b/app/Build/Commands/UpdateWebAssetsCommand.cs index a40e3ee1..fc757db3 100644 --- a/app/Build/Commands/UpdateWebAssetsCommand.cs +++ b/app/Build/Commands/UpdateWebAssetsCommand.cs @@ -2,6 +2,8 @@ // ReSharper disable UnusedType.Global // ReSharper disable UnusedMember.Global +using Build.Tools; + namespace Build.Commands; public sealed class UpdateWebAssetsCommand @@ -14,7 +16,7 @@ public sealed class UpdateWebAssetsCommand var rid = Environment.GetRidsForCurrentOS().First(); var cwd = Environment.GetAIStudioDirectory(); - var contentPath = Path.Join(cwd, "bin", "release", "net9.0", rid, "publish", "wwwroot", "_content"); + var contentPath = Path.Join(cwd, "bin", "release", Environment.DOTNET_VERSION, rid.ToName(), "publish", "wwwroot", "_content"); var isMudBlazorDirectoryPresent = Directory.Exists(Path.Join(contentPath, "MudBlazor")); if (!isMudBlazorDirectoryPresent) { diff --git a/app/Build/Tools/Environment.cs b/app/Build/Tools/Environment.cs index 70d7edf4..0729636d 100644 --- a/app/Build/Tools/Environment.cs +++ b/app/Build/Tools/Environment.cs @@ -4,6 +4,7 @@ namespace Build.Tools; 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"]; diff --git a/app/Build/Tools/RID.cs b/app/Build/Tools/RID.cs new file mode 100644 index 00000000..73ca86ee --- /dev/null +++ b/app/Build/Tools/RID.cs @@ -0,0 +1,15 @@ +namespace Build.Tools; + +public enum RID +{ + NONE, + + WIN_X64, + WIN_ARM64, + + LINUX_X64, + LINUX_ARM64, + + OSX_X64, + OSX_ARM64, +} \ No newline at end of file diff --git a/app/Build/Tools/RIDExtensions.cs b/app/Build/Tools/RIDExtensions.cs new file mode 100644 index 00000000..60fe4711 --- /dev/null +++ b/app/Build/Tools/RIDExtensions.cs @@ -0,0 +1,18 @@ +namespace Build.Tools; + +public static class RIDExtensions +{ + public static string ToName(this RID rid) => rid switch + { + RID.WIN_X64 => "win-x64", + RID.WIN_ARM64 => "win-arm64", + + RID.LINUX_X64 => "linux-x64", + RID.LINUX_ARM64 => "linux-arm64", + + RID.OSX_X64 => "osx-x64", + RID.OSX_ARM64 => "osx-arm64", + + _ => string.Empty, + }; +} \ No newline at end of file