asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

[Mono] Use the same search logic for both MSBuild and dotnet, add custom search paths on macOS.

Browse source
This commit is contained in:
bruvzg 2021-02-04 22:39:38 +02:00
parent 7e14a276da
commit e304f716c7
No known key found for this signature in database
GPG key ID: 009E1BFE42239B95
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs
View file

@ -86,7 +86,7 @@ namespace GodotTools.Build
{ {
case BuildTool.DotnetCli: case BuildTool.DotnetCli:
{ {
string dotnetCliPath = OS.PathWhich("dotnet"); string dotnetCliPath = FindBuildEngineOnUnix("dotnet");
if (!string.IsNullOrEmpty(dotnetCliPath)) if (!string.IsNullOrEmpty(dotnetCliPath))
return (dotnetCliPath, BuildTool.DotnetCli); return (dotnetCliPath, BuildTool.DotnetCli);
GD.PushError($"Cannot find executable for '{BuildManager.PropNameDotnetCli}'. Fallback to MSBuild from Mono."); GD.PushError($"Cannot find executable for '{BuildManager.PropNameDotnetCli}'. Fallback to MSBuild from Mono.");
@ -122,7 +122,11 @@ namespace GodotTools.Build
if (OS.IsMacOS) if (OS.IsMacOS)
{ {
result.Add("/Library/Frameworks/Mono.framework/Versions/Current/bin/"); result.Add("/Library/Frameworks/Mono.framework/Versions/Current/bin/");
result.Add("/opt/local/bin/");
result.Add("/usr/local/var/homebrew/linked/mono/bin/"); result.Add("/usr/local/var/homebrew/linked/mono/bin/");
result.Add("/usr/local/bin/");
result.Add("/usr/local/bin/dotnet/");
result.Add("/usr/local/share/dotnet/");
} }
result.Add("/opt/novell/mono/bin/"); result.Add("/opt/novell/mono/bin/");