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

Fix dotnet SDK detection on Linux

Browse Source 
The dotnet-sdk package on Arch Linux seems to different RID prefix in SDK location.
This commit is contained in:
Ari Vuollet
2023-01-28 19:50:30 +02:00
parent 9f7df23788
commit 641e746ee1
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ namespace Flax.Build
// Find system-installed SDK
string dotnetPath;
string os, arch;
string rid, ridFallback, arch;
string[] dotnetSdkVersions, dotnetRuntimeVersions;
switch (architecture)
{
@@ -85,7 +85,8 @@ namespace Flax.Build
{
case TargetPlatform.Windows:
{
os = $"win-{arch}";
rid = $"win-{arch}";
ridFallback = "";
#pragma warning disable CA1416
using RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry64);
using RegistryKey sdkVersionsKey = baseKey.OpenSubKey($@"SOFTWARE\WOW6432Node\dotnet\Setup\InstalledVersions\{arch}\sdk");
@@ -100,7 +101,14 @@ namespace Flax.Build
case TargetPlatform.Linux:
{
// TODO: Support /etc/dotnet/install_location
os = $"linux-{arch}";
// 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}";
ridFallback = $"linux-{arch}";
if (rid == ridFallback)
ridFallback = "";
dotnetPath = "/usr/share/dotnet/";
dotnetSdkVersions = Directory.GetDirectories($"{dotnetPath}sdk/").Select(Path.GetFileName).ToArray();
dotnetRuntimeVersions = Directory.GetDirectories($"{dotnetPath}shared/Microsoft.NETCore.App/").Select(Path.GetFileName).ToArray();
@@ -126,7 +134,9 @@ namespace Flax.Build
Log.Warning($"Unsupported .NET SDK {dotnetSdkVersion} version found. Minimum version required is .NET {MinimumVersion}.");
return;
}
HostRootPath = Path.Combine(dotnetPath, $"packs/Microsoft.NETCore.App.Host.{os}/{dotnetRuntimeVersion}/runtimes/{os}/native");
HostRootPath = Path.Combine(dotnetPath, $"packs/Microsoft.NETCore.App.Host.{rid}/{dotnetRuntimeVersion}/runtimes/{rid}/native");
if (!string.IsNullOrEmpty(ridFallback) && !Directory.Exists(HostRootPath))
HostRootPath = Path.Combine(dotnetPath, $"packs/Microsoft.NETCore.App.Host.{ridFallback}/{dotnetRuntimeVersion}/runtimes/{ridFallback}/native");
if (!Directory.Exists(HostRootPath))
{
Log.Warning($"Missing .NET SDK host runtime path in {HostRootPath}.");