Skip to content

Commit

Permalink
[runtime] Try to load assemblies from bundles on netcore before tryin…
Browse files Browse the repository at this point in the history
…g other methods, the ALC might not be initialized yet. (#34877)
  • Loading branch information
vargaz authored Apr 14, 2020
1 parent b88be15 commit 6e83eaf
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/mono/mono/metadata/assembly.c
Original file line number Diff line number Diff line change
Expand Up @@ -4806,9 +4806,7 @@ mono_assembly_request_byname (MonoAssemblyName *aname, const MonoAssemblyByNameR
result = prevent_reference_assembly_from_running (result, refonly);
}
#else
result = netcore_load_reference (aname, req->request.alc, req->requesting_assembly, !req->no_postload_search);

if (!result && bundles != NULL) {
if (bundles != NULL) {
MonoImageOpenStatus status;
MonoImage *image;
image = mono_assembly_open_from_bundle (req->request.alc, aname->name, &status, FALSE);
Expand All @@ -4819,6 +4817,8 @@ mono_assembly_request_byname (MonoAssemblyName *aname, const MonoAssemblyByNameR
if (image)
result = mono_assembly_request_load_from (image, aname->name, &req->request, &status);
}
if (!result)
result = netcore_load_reference (aname, req->request.alc, req->requesting_assembly, !req->no_postload_search);
#endif
return result;
}
Expand Down

0 comments on commit 6e83eaf

Please sign in to comment.