From 73bf28dc4712da7d465dda33299e107cfbc9df46 Mon Sep 17 00:00:00 2001 From: Crawcik Date: Thu, 14 Sep 2023 22:37:56 +0200 Subject: [PATCH] Change of priorities on RID --- Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs index e61642379..ecb6c9fea 100644 --- a/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs +++ b/Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs @@ -192,17 +192,13 @@ namespace Flax.Build case TargetPlatform.Linux: { // TODO: Support /etc/dotnet/install_location - rid = ""; - ridFallback = $"linux-{arch}"; + rid = $"linux-{arch}"; + ridFallback = ""; if (string.IsNullOrEmpty(dotnetPath)) dotnetPath ??= SearchForDotnetLocationLinux(); if (dotnetPath == null) - { - rid = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim(); - if (rid == ridFallback) - ridFallback = ""; - } + ridFallback = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim(); break; }