[assembly] Add Facades dir to default_path on all runtimes
authorAleksey Kliger <aleksey@xamarin.com>
Mon, 24 Apr 2017 17:48:38 +0000 (13:48 -0400)
committerAleksey Kliger <aleksey@xamarin.com>
Tue, 25 Apr 2017 19:25:52 +0000 (15:25 -0400)
Previous it was just the desktop runtime, but now that we have special handling
for framework facade assemblies in the loader, we should do it on other
runtimes, too.

mono/metadata/assembly.c

index 6b93b3fe8f11d3fbf99d4d5c57b5e3872575309f..93fbd89b7cb5c63ab770f96a9113bff6d831c129 100644 (file)
@@ -3533,7 +3533,7 @@ mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus *
        g_free (corlib_file);
 
 return_corlib_and_facades:
        g_free (corlib_file);
 
 return_corlib_and_facades:
-       if (corlib && !strcmp (runtime->framework_version, "4.5"))  // FIXME: stop hardcoding 4.5 here
+       if (corlib)
                default_path [1] = g_strdup_printf ("%s/Facades", corlib->basedir);
                
        return corlib;
                default_path [1] = g_strdup_printf ("%s/Facades", corlib->basedir);
                
        return corlib;