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

[macOS, .NET] Fix dotnet binary detection.

Browse source
This commit is contained in:
bruvzg 2022-09-14 18:13:06 +03:00
parent bf271ea6af
commit f4f556d198
No known key found for this signature in database
GPG key ID: 7960FCF39844EC38
1 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/mono/editor/GodotTools/GodotTools/Build/DotNetFinder.cs
View file

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
using System.Runtime.InteropServices;
using JetBrains.Annotations; using JetBrains.Annotations;
using OS = GodotTools.Utils.OS; using OS = GodotTools.Utils.OS;
@ -16,6 +17,23 @@ namespace GodotTools.Build
// In the future, this method may do more than just search in PATH. We could look in // In the future, this method may do more than just search in PATH. We could look in
// known locations or use Godot's linked nethost to search from the hostfxr location. // known locations or use Godot's linked nethost to search from the hostfxr location.
if (OS.IsMacOS)
{
if (RuntimeInformation.OSArchitecture == Architecture.X64)
{
string dotnet_x64 = "/usr/local/share/dotnet/x64/dotnet"; // Look for x64 version, when running under Rosetta 2.
if (File.Exists(dotnet_x64))
{
return dotnet_x64;
}
}
string dotnet = "/usr/local/share/dotnet/dotnet"; // Look for native version.
if (File.Exists(dotnet))
{
return dotnet;
}
}
return OS.PathWhich("dotnet"); return OS.PathWhich("dotnet");
} }