Merge branch 'linux_rid_fix' of https://github.com/GoaLitiuM/FlaxEngine into 1.6

2023-04-04 15:09:37 +02:00
parent 0c4a608b65 91247cc080
commit 0df9f5c797
1 changed files with 1 additions and 3 deletions
--- a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
+++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
@@ -194,9 +194,7 @@ namespace Flax.Build
                // TODO: Support /etc/dotnet/install_location

                // Detect custom RID in some distros
-                string osId = File.ReadAllLines("/etc/os-release").FirstOrDefault(x => x.StartsWith("ID="), "ID=linux").Substring("ID=".Length);
-
-                rid = $"{osId}-{arch}";
+                rid = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim();
                ridFallback = $"linux-{arch}";
                if (rid == ridFallback)
                    ridFallback = "";