From 4cfad13a69b6fb0f7e3658ea0ab4c60c92ea3a5f Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 12 Apr 2020 21:34:29 -0400 Subject: [PATCH] [runtime] Try to load assemblies from bundles on netcore before trying other methods, the ALC might not be initialized yet. --- src/mono/mono/metadata/assembly.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mono/mono/metadata/assembly.c b/src/mono/mono/metadata/assembly.c index 0dca99f38b23f1..377fe60986d5bd 100644 --- a/src/mono/mono/metadata/assembly.c +++ b/src/mono/mono/metadata/assembly.c @@ -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); @@ -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; }