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

Merge branch 'rollforward' of https://github.com/GoaLitiuM/FlaxEngine into GoaLitiuM-rollforward

Browse Source
This commit is contained in:
Wojtek Figat
2023-05-19 14:11:49 +02:00
parent 144b72109b f46d1a4aba
commit ee83c19c7b
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -691,6 +691,7 @@ bool MAssembly::LoadCorlib()
bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePath) bool MAssembly::LoadImage(const String& assemblyPath, const StringView& nativePath)
{ {
// TODO: Use new hostfxr delegate load_assembly_bytes? (.NET 8+)
// Open .Net assembly // Open .Net assembly
const StringAnsi assemblyPathAnsi = assemblyPath.ToStringAnsi(); const StringAnsi assemblyPathAnsi = assemblyPath.ToStringAnsi();
const char* name; const char* name;
@@ -1573,9 +1574,9 @@ bool InitHostfxr()
Platform::OpenUrl(TEXT("https://dotnet.microsoft.com/en-us/download/dotnet/7.0")); Platform::OpenUrl(TEXT("https://dotnet.microsoft.com/en-us/download/dotnet/7.0"));
#endif #endif
#if USE_EDITOR #if USE_EDITOR
LOG(Fatal, "Missing .NET 7 SDK installation requried to run Flax Editor."); LOG(Fatal, "Missing .NET 7 SDK installation required to run Flax Editor.");
#else #else
LOG(Fatal, "Missing .NET 7 Runtime installation requried to run this application."); LOG(Fatal, "Missing .NET 7 Runtime installation required to run this application.");
#endif #endif
return true; return true;
} }
@@ -1602,6 +1603,15 @@ bool InitHostfxr()
return true; return true;
} }
// TODO: Implement picking different version of hostfxr, currently prefers highest available version.
// Allow future and preview versions of .NET
String dotnetRollForward;
String dotnetRollForwardPr;
if (Platform::GetEnvironmentVariable(TEXT("DOTNET_ROLL_FORWARD"), dotnetRollForward))
Platform::SetEnvironmentVariable(TEXT("DOTNET_ROLL_FORWARD"), TEXT("LatestMajor"));
if (Platform::GetEnvironmentVariable(TEXT("DOTNET_ROLL_FORWARD_TO_PRERELEASE"), dotnetRollForwardPr))
Platform::SetEnvironmentVariable(TEXT("DOTNET_ROLL_FORWARD_TO_PRERELEASE"), TEXT("1"));
// Initialize hosting component // Initialize hosting component
const char_t* argv[1] = { libraryPath.Get() }; const char_t* argv[1] = { libraryPath.Get() };
hostfxr_initialize_parameters init_params; hostfxr_initialize_parameters init_params;