Fix loading C# assemblies from Mono AOT output

2023-03-31 18:31:25 +02:00
parent 7bec45dacf
commit e562a7d72c
3 changed files with 25 additions and 3 deletions
--- a/Source/Engine/Scripting/ManagedCLR/MCore.cpp
+++ b/Source/Engine/Scripting/ManagedCLR/MCore.cpp
@@ -65,16 +65,23 @@ bool MAssembly::Load(const String& assemblyPath, const StringView& nativePath)
    PROFILE_CPU();
    ZoneText(*assemblyPath, assemblyPath.Length());

+    const String* pathPtr = &assemblyPath;
+    String path;
    if (!FileSystem::FileExists(assemblyPath))
    {
-        Log::FileNotFoundException ex(assemblyPath);
-        return true;
+        path = assemblyPath;
+        pathPtr = &path;
+        if (ResolveMissingFile(path))
+        {
+            Log::FileNotFoundException ex(assemblyPath);
+            return true;
+        }
    }

    const auto startTime = DateTime::NowUTC();
    OnLoading();

-    if (LoadImage(assemblyPath, nativePath))
+    if (LoadImage(*pathPtr, nativePath))
    {
        OnLoadFailed();
        return true;