Bladeren bron

Merge pull request #45715 from bruvzg/mono_dotnet_path

[Mono] Use the same search logic for both `MSBuild` and `dotnet`.
Rémi Verschelde 4 jaren geleden
bovenliggende
commit
a7a51fb326
1 gewijzigde bestanden met toevoegingen van 5 en 1 verwijderingen
  1. 5 1
      modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs

+ 5 - 1
modules/mono/editor/GodotTools/GodotTools/Build/MsBuildFinder.cs

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