Merge branch 'master' of https://github.com/Zode/FlaxEngine into Zode-master

This commit is contained in:
Wojtek Figat
2023-10-01 11:35:06 +02:00

View File

@@ -192,11 +192,9 @@ namespace Flax.Build
case TargetPlatform.Linux: case TargetPlatform.Linux:
{ {
rid = $"linux-{arch}"; rid = $"linux-{arch}";
ridFallback = ""; ridFallback = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim();
if (string.IsNullOrEmpty(dotnetPath)) if (string.IsNullOrEmpty(dotnetPath))
dotnetPath ??= SearchForDotnetLocationLinux(); dotnetPath ??= SearchForDotnetLocationLinux();
if (dotnetPath == null)
ridFallback = Utilities.ReadProcessOutput("dotnet", "--info").Split('\n').FirstOrDefault(x => x.StartsWith(" RID:"), "").Replace("RID:", "").Trim();
break; break;
} }
case TargetPlatform.Mac: case TargetPlatform.Mac: