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

Merge branch 'GoaLitiuM-dotnet_sdk_detect_fix'

Browse Source
This commit is contained in:
Wojtek Figat
2025-04-12 22:21:16 +02:00
parent aea6f43519 1370225bae
commit bf9f7ee051
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -235,8 +235,8 @@ namespace Flax.Build
ridFallback = ""; ridFallback = "";
if (string.IsNullOrEmpty(dotnetPath)) if (string.IsNullOrEmpty(dotnetPath))
{ {
dotnetPath = "/usr/local/share/dotnet/"; dotnetPath = "/usr/local/share/dotnet/"; // Officially recommended dotnet location
if (!Directory.Exists(dotnetPath)) // Officially recommended dotnet location if (!Directory.Exists(dotnetPath))
{ {
if (Environment.GetEnvironmentVariable("PATH") is string globalBinPath) if (Environment.GetEnvironmentVariable("PATH") is string globalBinPath)
dotnetPath = globalBinPath.Split(':').FirstOrDefault(x => File.Exists(Path.Combine(x, "dotnet"))); dotnetPath = globalBinPath.Split(':').FirstOrDefault(x => File.Exists(Path.Combine(x, "dotnet")));
@@ -261,7 +261,7 @@ namespace Flax.Build
Log.Warning("Missing .NET SDK"); Log.Warning("Missing .NET SDK");
return; return;
} }
if (!Directory.Exists(dotnetPath)) if (!Directory.Exists(Path.Combine(dotnetPath, "sdk")))
{ {
Log.Warning($"Missing .NET SDK ({dotnetPath})"); Log.Warning($"Missing .NET SDK ({dotnetPath})");
return; return;
@@ -513,6 +513,8 @@ namespace Flax.Build
private static IEnumerable<string> GetVersions(string folder) private static IEnumerable<string> GetVersions(string folder)
{ {
if (!Directory.Exists(folder))
return Enumerable.Empty<string>();
return Directory.GetDirectories(folder).Select(Path.GetFileName); return Directory.GetDirectories(folder).Select(Path.GetFileName);
} }