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

Add env var DOTNET_ROOT support for dotnet location probing

Browse Source
This commit is contained in:
Wojtek Figat
2023-04-11 18:14:28 +02:00
parent 68c6a01805
commit f9e8ad7c12
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Engine/Scripting/Runtime/DotNet.cpp
View File

@@ -51,6 +51,7 @@ typedef char char_t;
#if PLATFORM_WINDOWS
#include <combaseapi.h>
#undef SetEnvironmentVariable
#undef GetEnvironmentVariable
#undef LoadLibrary
#undef LoadImage
#endif
@@ -1504,13 +1505,18 @@ bool InitHostfxr()
get_hostfxr_parameters get_hostfxr_params;
get_hostfxr_params.size = sizeof(hostfxr_initialize_parameters);
get_hostfxr_params.assembly_path = libraryPath.Get();
FLAX_CORECLR_STRING dotnetRoot;
// TODO: implement proper lookup for dotnet installation folder and handle standalone build of FlaxGame
#if PLATFORM_MAC
get_hostfxr_params.dotnet_root = "/usr/local/share/dotnet";
#else
get_hostfxr_params.dotnet_root = nullptr;
#endif
FLAX_CORECLR_STRING dotnetRoot;
String dotnetRootEnvVar;
if (!Platform::GetEnvironmentVariable(TEXT("DOTNET_ROOT"), dotnetRootEnvVar) && FileSystem::DirectoryExists(dotnetRootEnvVar))
{
dotnetRoot = dotnetRootEnvVar;
get_hostfxr_params.dotnet_root = dotnetRoot.Get();
}
#if !USE_EDITOR
const String& bundledDotnetPath = Globals::ProjectFolder / TEXT("Dotnet");
if (FileSystem::DirectoryExists(bundledDotnetPath))