GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-04 15:09:37 +02:00
parent 0c4a608b65 91247cc080
commit 0df9f5c797
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Tools/Flax.Build/Build/DotNet/DotNetSdk.cs
View File

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