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

Improve dotnet host runtime detection if pack has multiple different versions

Browse Source
This commit is contained in:
Wojtek Figat
2023-03-22 14:20:38 +01:00
parent 4c1519ba1b
commit 4c4a559125
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/ThirdParty/nethost/nethost.Build.cs vendored
View File

@@ -35,6 +35,8 @@ public class nethost : ThirdPartyModule
throw new Exception($"Missing NET SDK {DotNetSdk.MinimumVersion}."); throw new Exception($"Missing NET SDK {DotNetSdk.MinimumVersion}.");
if (!dotnetSdk.GetHostRuntime(options.Platform.Target, options.Architecture, out var hostRuntimePath)) if (!dotnetSdk.GetHostRuntime(options.Platform.Target, options.Architecture, out var hostRuntimePath))
{ {
if (options.Target.IsPreBuilt)
return; // Ignore missing Host Runtime when engine is already prebuilt
if (options.Flags.HasFlag(BuildFlags.GenerateProject)) if (options.Flags.HasFlag(BuildFlags.GenerateProject))
return; // Ignore missing Host Runtime at projects evaluation stage (not important) return; // Ignore missing Host Runtime at projects evaluation stage (not important)
throw new Exception($"Missing NET SDK runtime for {options.Platform.Target} {options.Architecture}."); throw new Exception($"Missing NET SDK runtime for {options.Platform.Target} {options.Architecture}.");

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

@@ -75,7 +75,7 @@ namespace Flax.Build
// Find system-installed SDK // Find system-installed SDK
string dotnetPath = Environment.GetEnvironmentVariable("DOTNET_ROOT"); string dotnetPath = Environment.GetEnvironmentVariable("DOTNET_ROOT");
string rid, ridFallback, arch; string rid, ridFallback, arch;
string[] dotnetSdkVersions = null, dotnetRuntimeVersions = null; IEnumerable<string> dotnetSdkVersions = null, dotnetRuntimeVersions = null;
switch (architecture) switch (architecture)
{ {
case TargetArchitecture.x86: case TargetArchitecture.x86:
@@ -147,9 +147,9 @@ namespace Flax.Build
return; return;
} }
if (dotnetSdkVersions == null) if (dotnetSdkVersions == null)
dotnetSdkVersions = Directory.GetDirectories(Path.Combine(dotnetPath, "sdk")).Select(Path.GetFileName).ToArray(); dotnetSdkVersions = GetVersions(Path.Combine(dotnetPath, "sdk"));
if (dotnetRuntimeVersions == null) if (dotnetRuntimeVersions == null)
dotnetRuntimeVersions = Directory.GetDirectories(Path.Combine(dotnetPath, "shared/Microsoft.NETCore.App/")).Select(Path.GetFileName).ToArray(); dotnetRuntimeVersions = GetVersions(Path.Combine(dotnetPath, "shared/Microsoft.NETCore.App"));
string dotnetSdkVersion = dotnetSdkVersions.OrderByDescending(ParseVersion).FirstOrDefault(); string dotnetSdkVersion = dotnetSdkVersions.OrderByDescending(ParseVersion).FirstOrDefault();
string dotnetRuntimeVersion = dotnetRuntimeVersions.OrderByDescending(ParseVersion).FirstOrDefault(); string dotnetRuntimeVersion = dotnetRuntimeVersions.OrderByDescending(ParseVersion).FirstOrDefault();
if (string.IsNullOrEmpty(dotnetSdkVersion)) if (string.IsNullOrEmpty(dotnetSdkVersion))
@@ -235,13 +235,24 @@ namespace Flax.Build
{ {
if (string.IsNullOrEmpty(rid)) if (string.IsNullOrEmpty(rid))
return false; return false;
var path = Path.Combine(RootPath, $"packs/Microsoft.NETCore.App.Host.{rid}/{RuntimeVersionName}/runtimes/{rid}/native");
var exists = Directory.Exists(path); // Pick pack folder
var packFolder = Path.Combine(RootPath, $"packs/Microsoft.NETCore.App.Host.{rid}");
var exists = Directory.Exists(packFolder);
if (!exists && runtimeName != null) if (!exists && runtimeName != null)
{ {
path = Path.Combine(RootPath, $"packs/Microsoft.NETCore.App.{runtimeName}.{rid}/{RuntimeVersionName}/runtimes/{rid}/native"); packFolder = Path.Combine(RootPath, $"packs/Microsoft.NETCore.App.{runtimeName}.{rid}");
exists = Directory.Exists(path); exists = Directory.Exists(packFolder);
} }
if (!exists)
return false;
// Pick version folder
var versions = GetVersions(packFolder);
var version = GetVersion(versions);
var path = Path.Combine(packFolder, $"{version}/runtimes/{rid}/native");
exists = Directory.Exists(path);
if (exists) if (exists)
_hostRuntimes[new KeyValuePair<TargetPlatform, TargetArchitecture>(platform, arch)] = path; _hostRuntimes[new KeyValuePair<TargetPlatform, TargetArchitecture>(platform, arch)] = path;
return exists; return exists;
@@ -259,5 +270,16 @@ namespace Flax.Build
Version ver = new Version(version); Version ver = new Version(version);
return new Version(ver.Major, ver.Minor, ver.Build, rev); return new Version(ver.Major, ver.Minor, ver.Build, rev);
} }
private static IEnumerable<string> GetVersions(string folder)
{
return Directory.GetDirectories(folder).Select(Path.GetFileName);
}
private static string GetVersion(IEnumerable<string> versions)
{
// TODO: reject 'future' versions like .Net 8?
return versions.OrderByDescending(ParseVersion).FirstOrDefault();
}
} }
} }