{"Microsoft.Build.Utilities.v3.5", 2, "Microsoft.Build.Utilities.v4.0"},
{"Microsoft.VisualBasic", 1},
{"Microsoft.VisualC", 1},
+ FACADE_ASSEMBLY ("Microsoft.Win32.Primitives"),
+ FACADE_ASSEMBLY ("Microsoft.Win32.Registry"),
+ FACADE_ASSEMBLY ("Microsoft.Win32.Registry.AccessControl"),
{"Mono.Cairo", 0},
{"Mono.CompilerServices.SymbolWriter", 0},
{"Mono.Data", 0},
{"System.Net.Http", 4},
{"System.Net.Http.Rtc", 0},
FACADE_ASSEMBLY ("System.Net.HttpListener"),
- {"System.Net.NetworkInformation", 0},
FACADE_ASSEMBLY ("System.Net.Mail"),
FACADE_ASSEMBLY ("System.Net.NameResolution"),
FACADE_ASSEMBLY ("System.Net.NetworkInformation"),
{"System.Numerics.Vectors", 3},
FACADE_ASSEMBLY ("System.ObjectModel"),
FACADE_ASSEMBLY ("System.Reflection"),
+ FACADE_ASSEMBLY ("System.Reflection.DispatchProxy"),
FACADE_ASSEMBLY ("System.Reflection.Emit"),
FACADE_ASSEMBLY ("System.Reflection.Emit.ILGeneration"),
FACADE_ASSEMBLY ("System.Reflection.Emit.Lightweight"),
FACADE_ASSEMBLY ("System.Runtime.Extensions"),
FACADE_ASSEMBLY ("System.Runtime.Handles"),
FACADE_ASSEMBLY ("System.Runtime.InteropServices"),
- {"System.Runtime.InteropServices.RuntimeInformation", 2},
+ FACADE_ASSEMBLY ("System.Runtime.InteropServices.RuntimeInformation"),
FACADE_ASSEMBLY ("System.Runtime.InteropServices.WindowsRuntime"),
+ FACADE_ASSEMBLY ("System.Runtime.Loader"),
FACADE_ASSEMBLY ("System.Runtime.Numerics"),
{"System.Runtime.Remoting", 0},
{"System.Runtime.Serialization", 3},
- {"System.Runtime.Serialization.Formatters", 3},
+ FACADE_ASSEMBLY ("System.Runtime.Serialization.Formatters"),
{"System.Runtime.Serialization.Formatters.Soap", 0},
FACADE_ASSEMBLY ("System.Runtime.Serialization.Json"),
FACADE_ASSEMBLY ("System.Runtime.Serialization.Primitives"),
FACADE_ASSEMBLY ("System.Security.Principal.Windows"),
FACADE_ASSEMBLY ("System.Security.SecureString"),
{"System.ServiceModel", 3},
- {"System.ServiceModel.Duplex", 3},
- {"System.ServiceModel.Http", 3},
- {"System.ServiceModel.NetTcp", 3},
- {"System.ServiceModel.Primitives", 3},
- {"System.ServiceModel.Security", 3},
+ FACADE_ASSEMBLY ("System.ServiceModel.Duplex"),
+ FACADE_ASSEMBLY ("System.ServiceModel.Http"),
+ FACADE_ASSEMBLY ("System.ServiceModel.NetTcp"),
+ FACADE_ASSEMBLY ("System.ServiceModel.Primitives"),
+ FACADE_ASSEMBLY ("System.ServiceModel.Security"),
{"System.ServiceModel.Web", 2},
{"System.ServiceProcess", 0},
FACADE_ASSEMBLY ("System.ServiceProcess.ServiceController"),
{"System.Xml.Serialization", 0},
FACADE_ASSEMBLY ("System.Xml.XDocument"),
FACADE_ASSEMBLY ("System.Xml.XPath"),
- {"System.Xml.XPath.XmlDocument", 3},
+ FACADE_ASSEMBLY ("System.Xml.XPath.XmlDocument"),
FACADE_ASSEMBLY ("System.Xml.XPath.XDocument"),
FACADE_ASSEMBLY ("System.Xml.XmlDocument"),
FACADE_ASSEMBLY ("System.Xml.XmlSerializer"),
static GList *loaded_assemblies = NULL;
static MonoAssembly *corlib;
-#if defined(__native_client__)
-
-/* On Native Client, allow mscorlib to be loaded from memory */
-/* instead of loaded off disk. If these are not set, default */
-/* mscorlib loading will take place */
-
-/* NOTE: If mscorlib data is passed to mono in this way then */
-/* it needs to remain allocated during the use of mono. */
-
-static void *corlibData = NULL;
-static size_t corlibSize = 0;
-
-void
-mono_set_corlib_data (void *data, size_t size)
-{
- corlibData = data;
- corlibSize = size;
-}
-
-#endif
-
static char* unquote (const char *str);
/* This protects loaded_assemblies and image->references */
}
}
-/* Native Client can't get this info from an environment variable so */
-/* it's passed in to the runtime, or set manually by embedding code. */
-#ifdef __native_client__
-char* nacl_mono_path = NULL;
-#endif
-
static void
check_path_env (void)
{
return;
char* path = g_getenv ("MONO_PATH");
-#ifdef __native_client__
- if (!path)
- path = strdup (nacl_mono_path);
-#endif
if (!path)
return;
}
if (image->assembly) {
- /* Already loaded by another appdomain */
- mono_assembly_invoke_load_hook (image->assembly);
- mono_image_close (image);
- g_free (fname);
- return image->assembly;
+ /* We want to return the MonoAssembly that's already loaded,
+ * but if we're using the strict assembly loader, we also need
+ * to check that the previously loaded assembly matches the
+ * predicate. It could be that we previously loaded a
+ * different version that happens to have the filename that
+ * we're currently probing. */
+ if (mono_loader_get_strict_strong_names () &&
+ predicate && !predicate (image->assembly, user_data)) {
+ mono_image_close (image);
+ g_free (fname);
+ return NULL;
+ } else {
+ /* Already loaded by another appdomain */
+ mono_assembly_invoke_load_hook (image->assembly);
+ mono_image_close (image);
+ g_free (fname);
+ return image->assembly;
+ }
}
ass = mono_assembly_load_from_predicate (image, fname, refonly, predicate, user_data, status);
gboolean
mono_assembly_has_reference_assembly_attribute (MonoAssembly *assembly, MonoError *error)
{
+ g_assert (assembly && assembly->image);
+ /* .NET Framework appears to ignore the attribute on dynamic
+ * assemblies, so don't call this function for dynamic assemblies. */
+ g_assert (!image_is_dynamic (assembly->image));
error_init (error);
/*
ass->ref_only = refonly;
ass->image = image;
- mono_profiler_assembly_event (ass, MONO_PROFILE_START_LOAD);
+ MONO_PROFILER_RAISE (assembly_loading, (ass));
mono_assembly_fill_assembly_name (image, &ass->aname);
mono_assembly_invoke_load_hook (ass);
- mono_profiler_assembly_loaded (ass, MONO_PROFILE_OK);
+ MONO_PROFILER_RAISE (assembly_loaded, (ass));
return ass;
}
return corlib;
}
- // In native client, Corlib is embedded in the executable as static variable corlibData
-#if defined(__native_client__)
- if (corlibData != NULL && corlibSize != 0) {
- int status = 0;
- /* First "FALSE" instructs mono not to make a copy. */
- /* Second "FALSE" says this is not just a ref. */
- MonoImage* image = mono_image_open_from_data_full (corlibData, corlibSize, FALSE, &status, FALSE);
- if (image == NULL || status != 0)
- g_print("mono_image_open_from_data_full failed: %d\n", status);
- corlib = mono_assembly_load_from_full (image, "mscorlib", &status, FALSE);
- if (corlib == NULL || status != 0)
- g_print ("mono_assembly_load_from_full failed: %d\n", status);
- if (corlib)
- return corlib;
- }
-#endif
-
// A nonstandard preload hook may provide a special mscorlib assembly
aname = mono_assembly_name_new ("mscorlib.dll");
corlib = invoke_assembly_preload_hook (aname, assemblies_path);
{
MonoError refasm_error;
error_init (&refasm_error);
- if (candidate && !refonly && mono_assembly_has_reference_assembly_attribute (candidate, &refasm_error)) {
- candidate = NULL;
+ if (candidate && !refonly) {
+ /* .NET Framework seems to not check for ReferenceAssemblyAttribute on dynamic assemblies */
+ if (!image_is_dynamic (candidate->image) &&
+ mono_assembly_has_reference_assembly_attribute (candidate, &refasm_error))
+ candidate = NULL;
}
mono_error_cleanup (&refasm_error);
return candidate;
if (InterlockedDecrement (&assembly->ref_count) > 0)
return FALSE;
- mono_profiler_assembly_event (assembly, MONO_PROFILE_START_UNLOAD);
+ MONO_PROFILER_RAISE (assembly_unloading, (assembly));
mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly);
g_slist_free (assembly->friend_assembly_names);
g_free (assembly->basedir);
- mono_profiler_assembly_event (assembly, MONO_PROFILE_END_UNLOAD);
+ MONO_PROFILER_RAISE (assembly_unloaded, (assembly));
return TRUE;
}
projects / mono.git / blobdiff