Merge remote-tracking branch 'origin/1.6' into 1.7

This commit is contained in:
Wojtek Figat
2023-07-09 11:55:50 +02:00
25 changed files with 315 additions and 176 deletions

View File

@@ -199,7 +199,11 @@ namespace Flax.Build
if (rid == ridFallback)
ridFallback = "";
if (string.IsNullOrEmpty(dotnetPath))
dotnetPath = "/usr/share/dotnet/";
{
dotnetPath = "/usr/lib/dotnet/";
if (!Directory.Exists(dotnetPath))
dotnetPath = "/usr/share/dotnet/";
}
break;
}
case TargetPlatform.Mac: