From 58d0ed18e6b4643125a89cae0501281b23d135ae Mon Sep 17 00:00:00 2001 From: Ari Vuollet Date: Fri, 17 Feb 2023 16:56:09 +0200 Subject: [PATCH] Improve Linux dotnet runtime identifier detection --- Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs index af7ac1b6b..037121e1c 100644 --- a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs +++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs @@ -102,9 +102,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 = "";