Hide some more methods
[mono.git] / mono / metadata / assembly.c
index 4952aac3640077732b42aa83e17baad1b2648efe..b72ce7fb3fc38e3fc62f93269442ca7d5b258595 100644 (file)
 #include "image.h"
 #include "cil-coff.h"
 #include "rawbuffer.h"
-#ifdef WITH_BUNDLE
-#include "mono-bundle.h"
-#endif
 #include <mono/metadata/loader.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/metadata-internals.h>
+#include <mono/metadata/class-internals.h>
+#include <mono/metadata/domain-internals.h>
+#include <mono/metadata/mono-endian.h>
 #include <mono/io-layer/io-layer.h>
 #include <mono/utils/mono-uri.h>
 #include <mono/metadata/mono-config.h>
 #include <mono/utils/mono-digest.h>
 #include <mono/utils/mono-logger.h>
-#ifdef PLATFORM_WIN32
-#include <mono/os/util.h>
+#include <mono/metadata/reflection.h>
+
+#ifndef PLATFORM_WIN32
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/stat.h>
 #endif
 
-/* the default search path is just MONO_ASSEMBLIES */
+/* AssemblyVersionMap: an assembly name and the assembly version set on which it is based */
+typedef struct  {
+       const char* assembly_name;
+       guint8 version_set_index;
+} AssemblyVersionMap;
+
+/* the default search path is empty, the first slot is replaced with the computed value */
 static const char*
 default_path [] = {
-       MONO_ASSEMBLIES,
+       NULL,
        NULL
 };
 
+/* Contains the list of directories to be searched for assemblies (MONO_PATH) */
 static char **assemblies_path = NULL;
 
+/* Contains the list of directories that point to auxiliary GACs */
+static char **extra_gac_paths = NULL;
+
+/* The list of system assemblies what will be remapped to the running
+ * runtime version. WARNING: this list must be sorted.
+ */
+static const AssemblyVersionMap framework_assemblies [] = {
+       {"Accessibility", 0},
+       {"Commons.Xml.Relaxng", 0},
+       {"I18N", 0},
+       {"I18N.CJK", 0},
+       {"I18N.MidEast", 0},
+       {"I18N.Other", 0},
+       {"I18N.Rare", 0},
+       {"I18N.West", 0},
+       {"Microsoft.VisualBasic", 1},
+       {"Microsoft.VisualC", 1},
+       {"Mono.Cairo", 0},
+       {"Mono.CompilerServices.SymbolWriter", 0},
+       {"Mono.Data", 0},
+       {"Mono.Data.SqliteClient", 0},
+       {"Mono.Data.SybaseClient", 0},
+       {"Mono.Data.Tds", 0},
+       {"Mono.Data.TdsClient", 0},
+       {"Mono.GetOptions", 0},
+       {"Mono.Http", 0},
+       {"Mono.Posix", 0},
+       {"Mono.Security", 0},
+       {"Mono.Security.Win32", 0},
+       {"Mono.Xml.Ext", 0},
+       {"Novell.Directory.Ldap", 0},
+       {"Npgsql", 0},
+       {"PEAPI", 0},
+       {"System", 0},
+       {"System.Configuration.Install", 0},
+       {"System.Data", 0},
+       {"System.Data.OracleClient", 0},
+       {"System.Data.SqlXml", 0},
+       {"System.Design", 0},
+       {"System.DirectoryServices", 0},
+       {"System.Drawing", 0},
+       {"System.Drawing.Design", 0},
+       {"System.EnterpriseServices", 0},
+       {"System.Management", 0},
+       {"System.Messaging", 0},
+       {"System.Runtime.Remoting", 0},
+       {"System.Runtime.Serialization.Formatters.Soap", 0},
+       {"System.Security", 0},
+       {"System.ServiceProcess", 0},
+       {"System.Web", 0},
+       {"System.Web.Mobile", 0},
+       {"System.Web.Services", 0},
+       {"System.Windows.Forms", 0},
+       {"System.Xml", 0},
+       {"mscorlib", 0}
+};
+
 /*
  * keeps track of loaded assemblies
  */
@@ -48,12 +116,24 @@ static GList *loaded_assemblies = NULL;
 static MonoAssembly *corlib;
 
 /* This protects loaded_assemblies and image->references */
+#define mono_assemblies_lock() EnterCriticalSection (&assemblies_mutex)
+#define mono_assemblies_unlock() LeaveCriticalSection (&assemblies_mutex)
 static CRITICAL_SECTION assemblies_mutex;
 
 /* A hastable of thread->assembly list mappings */
 static GHashTable *assemblies_loading;
 
-static char **extra_gac_paths = NULL;
+/* A hashtable of reflection only load thread->assemblies mappings */
+static GHashTable *assemblies_refonly_loading;
+
+/* If defined, points to the bundled assembly information */
+const MonoBundledAssembly **bundles;
+
+/* Loaded assembly binding info */
+static GSList *loaded_assembly_bindings = NULL;
+
+static MonoAssembly*
+mono_assembly_invoke_search_hook_internal (MonoAssemblyName *aname, gboolean refonly, gboolean postload);
 
 static gchar*
 encode_public_tok (const guchar *token, gint32 len)
@@ -72,7 +152,8 @@ encode_public_tok (const guchar *token, gint32 len)
 }
 
 static void
-check_path_env (void) {
+check_path_env (void)
+{
        const char *path;
        char **splitted;
        
@@ -120,6 +201,142 @@ check_extra_gac_path_env (void) {
 }
 
 static gboolean
+assembly_binding_maps_name (MonoAssemblyBindingInfo *info, MonoAssemblyName *aname)
+{
+       if (strcmp (info->name, aname->name))
+               return FALSE;
+
+       if (info->major != aname->major || info->minor != aname->minor)
+               return FALSE;
+
+       if ((info->culture != NULL) != (aname->culture != NULL))
+               return FALSE;
+       
+       if (info->culture && strcmp (info->culture, aname->culture))
+               return FALSE;
+       
+       if (strcmp ((const char *)info->public_key_token, (const char *)aname->public_key_token))
+               return FALSE;
+
+       return TRUE;
+}
+
+static void
+mono_assembly_binding_info_free (MonoAssemblyBindingInfo *info)
+{
+       g_free (info->name);
+       g_free (info->culture);
+}
+
+static void
+get_publisher_policy_info (MonoImage *image, MonoAssemblyName *aname, MonoAssemblyBindingInfo *binding_info)
+{
+       MonoTableInfo *t;
+       guint32 cols [MONO_MANIFEST_SIZE];
+       const gchar *filename;
+       gchar *subpath, *fullpath;
+
+       t = &image->tables [MONO_TABLE_MANIFESTRESOURCE];
+       /* MS Impl. accepts policy assemblies with more than
+        * one manifest resource, and only takes the first one */
+       if (t->rows < 1) {
+               binding_info->is_valid = FALSE;
+               return;
+       }
+       
+       mono_metadata_decode_row (t, 0, cols, MONO_MANIFEST_SIZE);
+       if ((cols [MONO_MANIFEST_IMPLEMENTATION] & MONO_IMPLEMENTATION_MASK) != MONO_IMPLEMENTATION_FILE) {
+               binding_info->is_valid = FALSE;
+               return;
+       }
+       
+       filename = mono_metadata_string_heap (image, cols [MONO_MANIFEST_NAME]);
+       g_assert (filename != NULL);
+       
+       subpath = g_path_get_dirname (image->name);
+       fullpath = g_build_path (G_DIR_SEPARATOR_S, subpath, filename, NULL);
+       mono_config_parse_publisher_policy (fullpath, binding_info);
+       g_free (subpath);
+       g_free (fullpath);
+       
+       /* Define the optional elements/attributes before checking */
+       if (!binding_info->culture)
+               binding_info->culture = g_strdup ("");
+       
+       /* Check that the most important elements/attributes exist */
+       if (!binding_info->name || !binding_info->public_key_token [0] || !binding_info->has_old_version_bottom ||
+                       !binding_info->has_new_version || !assembly_binding_maps_name (binding_info, aname)) {
+               mono_assembly_binding_info_free (binding_info);
+               binding_info->is_valid = FALSE;
+               return;
+       }
+
+       binding_info->is_valid = TRUE;
+}
+
+static int
+compare_versions (AssemblyVersionSet *v, MonoAssemblyName *aname)
+{
+       if (v->major > aname->major)
+               return 1;
+       else if (v->major < aname->major)
+               return -1;
+
+       if (v->minor > aname->minor)
+               return 1;
+       else if (v->minor < aname->minor)
+               return -1;
+
+       if (v->build > aname->build)
+               return 1;
+       else if (v->build < aname->build)
+               return -1;
+
+       if (v->revision > aname->revision)
+               return 1;
+       else if (v->revision < aname->revision)
+               return -1;
+
+       return 0;
+}
+
+static gboolean
+check_policy_versions (MonoAssemblyBindingInfo *info, MonoAssemblyName *name)
+{
+       if (!info->is_valid)
+               return FALSE;
+       
+       /* If has_old_version_top doesn't exist, we don't have an interval */
+       if (!info->has_old_version_top) {
+               if (compare_versions (&info->old_version_bottom, name) == 0)
+                       return TRUE;
+
+               return FALSE;
+       }
+
+       /* Check that the version defined by name is valid for the interval */
+       if (compare_versions (&info->old_version_top, name) < 0)
+               return FALSE;
+
+       /* We should be greater or equal than the small version */
+       if (compare_versions (&info->old_version_bottom, name) > 0)
+               return FALSE;
+
+       return TRUE;
+}
+
+/**
+ * mono_assembly_names_equal:
+ * @l: first assembly
+ * @r: second assembly.
+ *
+ * Compares two MonoAssemblyNames and returns whether they are equal.
+ * This compares the names, the cultures, the release version and their
+ * public tokens.
+ *
+ * Returns: TRUE if both assembly names are equal.
+ */
+gboolean
 mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)
 {
        if (!l->name || !r->name)
@@ -131,51 +348,36 @@ mono_assembly_names_equal (MonoAssemblyName *l, MonoAssemblyName *r)
        if (l->culture && r->culture && strcmp (l->culture, r->culture))
                return FALSE;
 
-        /*
-         * simply compare names until some other issues are resolved
-         * (version info not getting set correctly for custom
-         * attributes).
-         */
-        /*
        if (l->major != r->major || l->minor != r->minor ||
                        l->build != r->build || l->revision != r->revision)
-               return FALSE;
+               if (! ((l->major == 0 && l->minor == 0 && l->build == 0 && l->revision == 0) || (r->major == 0 && r->minor == 0 && r->build == 0 && r->revision == 0)))
+                       return FALSE;
 
-       if (!l->public_tok_value && !r->public_tok_value)
+       if (!l->public_key_token [0] || !r->public_key_token [0])
                return TRUE;
 
-       if ((l->public_tok_value && !r->public_tok_value) || (!l->public_tok_value && r->public_tok_value))
+       if (strcmp (l->public_key_token, r->public_key_token))
                return FALSE;
 
-       if (strcmp (l->public_tok_value, r->public_tok_value))
-               return FALSE;
-        */
        return TRUE;
 }
 
-/* assemblies_mutex must be held by the caller */
 static MonoAssembly*
-search_loaded (MonoAssemblyName* aname)
+search_loaded (MonoAssemblyName* aname, gboolean refonly)
 {
        GList *tmp;
        MonoAssembly *ass;
        GList *loading;
-       
-       for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
-               /* g_print ("compare %s %s\n", aname->name, ass->aname.name); */
-               if (!mono_assembly_names_equal (aname, &ass->aname))
-                       continue;
-               /* g_print ("success\n"); */
 
+       ass = mono_assembly_invoke_search_hook_internal (aname, refonly, FALSE);
+       if (ass)
                return ass;
-       }
-
+       
        /*
         * The assembly might be under load by this thread. In this case, it is
         * safe to return an incomplete instance to prevent loops.
         */
-       loading = g_hash_table_lookup (assemblies_loading, GetCurrentThread ());
+       loading = g_hash_table_lookup (refonly ? assemblies_refonly_loading : assemblies_loading, GetCurrentThread ());
        for (tmp = loading; tmp; tmp = tmp->next) {
                ass = tmp->data;
                if (!mono_assembly_names_equal (aname, &ass->aname))
@@ -188,7 +390,7 @@ search_loaded (MonoAssemblyName* aname)
 }
 
 static MonoAssembly *
-load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status)
+load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status, MonoBoolean refonly)
 {
        int i;
        char *fullpath;
@@ -196,7 +398,7 @@ load_in_path (const char *basename, const char** search_path, MonoImageOpenStatu
 
        for (i = 0; search_path [i]; ++i) {
                fullpath = g_build_filename (search_path [i], basename, NULL);
-               result = mono_assembly_open (fullpath, status);
+               result = mono_assembly_open_full (fullpath, status, refonly);
                g_free (fullpath);
                if (result)
                        return result;
@@ -223,12 +425,189 @@ mono_assembly_setrootdir (const char *root_dir)
        default_path [0] = g_strdup (root_dir);
 }
 
+/**
+ * mono_assembly_getrootdir:
+ *
+ * Returns: The internal root directory used for looking up assemblies
+ */
 G_CONST_RETURN gchar *
 mono_assembly_getrootdir (void)
 {
        return default_path [0];
 }
 
+/**
+ * mono_set_dirs:
+ * @assembly_dir: the base directory for assemblies
+ * @config_dir: the base directory for configuration files
+ *
+ * This routine is used internally and by developers embedding
+ * the runtime into their own applications.  There are a number
+ * of cases to consider: Mono as a system-installed package that
+ * is available on the location preconfigured or Mono in a relocated
+ * location.
+ *
+ * If you are using a system-installed Mono, you can pass NULL
+ * to both parameters.  If you are not, you should compute both
+ * directory values and call this routine.
+ *
+ * The values for a given PREFIX are:
+ *
+ *    assembly_dir: PREFIX/lib
+ *    config_dir:   PREFIX/etc
+ *
+ * Notice that embedders that use Mono in a relocated way must
+ * compute the location at runtime, as they will be in control
+ * of where Mono is installed.
+ */
+void
+mono_set_dirs (const char *assembly_dir, const char *config_dir)
+{
+#if defined (MONO_ASSEMBLIES)
+       if (assembly_dir == NULL)
+               assembly_dir = MONO_ASSEMBLIES;
+#endif
+#if defined (MONO_CFG_DIR)
+       if (config_dir == NULL)
+               config_dir = MONO_CFG_DIR;
+#endif
+       mono_assembly_setrootdir (assembly_dir);
+       mono_set_config_dir (config_dir);
+}
+
+#ifndef PLATFORM_WIN32
+
+static char *
+compute_base (char *path)
+{
+       char *p = rindex (path, '/');
+       if (p == NULL)
+               return NULL;
+
+       /* Not a well known Mono executable, we are embedded, cant guess the base  */
+       if (strcmp (p, "/mono") && strcmp (p, "/monodis") && strcmp (p, "/mint") && strcmp (p, "/monodiet"))
+               return NULL;
+           
+       *p = 0;
+       p = rindex (path, '/');
+       if (p == NULL)
+               return NULL;
+       
+       if (strcmp (p, "/bin") != 0)
+               return NULL;
+       *p = 0;
+       return path;
+}
+
+static void
+fallback (void)
+{
+       mono_set_dirs (MONO_ASSEMBLIES, MONO_CFG_DIR);
+}
+
+static void
+set_dirs (char *exe)
+{
+       char *base;
+       char *config, *lib, *mono;
+       struct stat buf;
+       
+       /*
+        * Only /usr prefix is treated specially
+        */
+       if (strncmp (exe, MONO_BINDIR, strlen (MONO_BINDIR)) == 0 || (base = compute_base (exe)) == NULL){
+               fallback ();
+               return;
+       }
+
+       config = g_build_filename (base, "etc", NULL);
+       lib = g_build_filename (base, "lib", NULL);
+       mono = g_build_filename (lib, "mono/1.0", NULL);
+       if (stat (mono, &buf) == -1)
+               fallback ();
+       else {
+               mono_set_dirs (lib, config);
+       }
+       
+       g_free (config);
+       g_free (lib);
+       g_free (mono);
+}
+
+#endif /* PLATFORM_WIN32 */
+
+#ifdef UNDER_CE
+#undef GetModuleFileName
+#define GetModuleFileName ceGetModuleFileNameA
+
+DWORD ceGetModuleFileNameA(HMODULE hModule, char* lpFilename, DWORD nSize)
+{
+       DWORD res = 0;
+       wchar_t* wbuff = (wchar_t*)LocalAlloc(LPTR, nSize*2);
+       res = GetModuleFileNameW(hModule, wbuff, nSize);
+       if (res) {
+               int len = wcslen(wbuff);
+               WideCharToMultiByte(CP_ACP, 0, wbuff, len, lpFilename, len, NULL, NULL);
+       }
+       LocalFree(wbuff);
+       return res;
+}
+#endif
+
+/**
+ * mono_set_rootdir:
+ *
+ * Registers the root directory for the Mono runtime, for Linux and Solaris 10,
+ * this auto-detects the prefix where Mono was installed. 
+ */
+void
+mono_set_rootdir (void)
+{
+#ifdef PLATFORM_WIN32
+       gunichar2 moddir [MAXPATHLEN];
+       gchar *bindir, *installdir, *root, *utf8name, *config;
+
+       GetModuleFileNameW (NULL, moddir, MAXPATHLEN);
+       utf8name = g_utf16_to_utf8 (moddir, -1, NULL, NULL, NULL);
+       bindir = g_path_get_dirname (utf8name);
+       installdir = g_path_get_dirname (bindir);
+       root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
+
+       config = g_build_filename (root, "..", "etc", NULL);
+       mono_set_dirs (root, config);
+
+       g_free (config);
+       g_free (root);
+       g_free (installdir);
+       g_free (bindir);
+       g_free (utf8name);
+#else
+       char buf [4096];
+       int  s;
+       char *str;
+
+       /* Linux style */
+       s = readlink ("/proc/self/exe", buf, sizeof (buf)-1);
+
+       if (s != -1){
+               buf [s] = 0;
+               set_dirs (buf);
+               return;
+       }
+
+       /* Solaris 10 style */
+       str = g_strdup_printf ("/proc/%d/path/a.out", getpid ());
+       s = readlink (str, buf, sizeof (buf)-1);
+       g_free (str);
+       if (s != -1){
+               buf [s] = 0;
+               set_dirs (buf);
+               return;
+       } 
+       fallback ();
+#endif
+}
+
 /**
  * mono_assemblies_init:
  *
@@ -237,9 +616,12 @@ mono_assembly_getrootdir (void)
 void
 mono_assemblies_init (void)
 {
-#ifdef PLATFORM_WIN32
-       mono_set_rootdir ();
-#endif
+       /*
+        * Initialize our internal paths if we have not been initialized yet.
+        * This happens when embedders use Mono.
+        */
+       if (mono_assembly_getrootdir () == NULL)
+               mono_set_rootdir ();
 
        check_path_env ();
        check_extra_gac_path_env ();
@@ -247,6 +629,7 @@ mono_assemblies_init (void)
        InitializeCriticalSection (&assemblies_mutex);
 
        assemblies_loading = g_hash_table_new (NULL, NULL);
+       assemblies_refonly_loading = g_hash_table_new (NULL, NULL);
 }
 
 gboolean
@@ -276,7 +659,7 @@ mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname)
                int len;
 
                aname->public_key = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLY_PUBLIC_KEY]);
-               len = mono_metadata_decode_blob_size (aname->public_key, &aname->public_key);
+               len = mono_metadata_decode_blob_size (aname->public_key, (const char**)&aname->public_key);
 
                mono_digest_get_public_token (token, aname->public_key, len);
                encoded = encode_public_tok (token, 8);
@@ -299,6 +682,24 @@ mono_assembly_fill_assembly_name (MonoImage *image, MonoAssemblyName *aname)
        return TRUE;
 }
 
+/*
+ * mono_stringify_assembly_name:
+ *
+ *   Convert @aname into its string format. The returned string is dynamically
+ * allocated and should be freed by the caller.
+ */
+char*
+mono_stringify_assembly_name (MonoAssemblyName *aname)
+{
+       return g_strdup_printf (
+               "%s, Version=%d.%d.%d.%d, Culture=%s%s%s",
+               aname->name,
+               aname->major, aname->minor, aname->build, aname->revision,
+               aname->culture && *aname->culture? aname->culture: "neutral",
+               aname->public_key_token [0] ? ", PublicKeyToken=" : "",
+               aname->public_key_token [0] ? (char *)aname->public_key_token : "");
+}
+
 static gchar*
 assemblyref_public_tok (MonoImage *image, guint32 key_index, guint32 flags)
 {
@@ -317,138 +718,200 @@ assemblyref_public_tok (MonoImage *image, guint32 key_index, guint32 flags)
        return encode_public_tok (public_tok, len);
 }
 
+/**
+ * mono_assembly_addref:
+ * @assemnly: the assembly to reference
+ *
+ * This routine increments the reference count on a MonoAssembly.
+ * The reference count is reduced every time the method mono_assembly_close() is
+ * invoked.
+ */
 void
-mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
+mono_assembly_addref (MonoAssembly *assembly)
+{
+       InterlockedIncrement (&assembly->ref_count);
+}
+
+static MonoAssemblyName *
+mono_assembly_remap_version (MonoAssemblyName *aname, MonoAssemblyName *dest_aname)
+{
+       const MonoRuntimeInfo *current_runtime;
+       int pos, first, last;
+
+       if (aname->name == NULL) return aname;
+       current_runtime = mono_get_runtime_info ();
+
+       first = 0;
+       last = G_N_ELEMENTS (framework_assemblies) - 1;
+       
+       while (first <= last) {
+               int res;
+               pos = first + (last - first) / 2;
+               res = strcmp (aname->name, framework_assemblies[pos].assembly_name);
+               if (res == 0) {
+                       const AssemblyVersionSet* vset;
+                       int index = framework_assemblies[pos].version_set_index;
+                       g_assert (index < G_N_ELEMENTS (current_runtime->version_sets));
+                       vset = &current_runtime->version_sets [index];
+
+                       if (aname->major == vset->major && aname->minor == vset->minor &&
+                               aname->build == vset->build && aname->revision == vset->revision)
+                               return aname;
+               
+                       if ((aname->major | aname->minor | aname->build | aname->revision) != 0)
+                               mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_ASSEMBLY,
+                                       "The request to load the assembly %s v%d.%d.%d.%d was remapped to v%d.%d.%d.%d",
+                                                       aname->name,
+                                                       aname->major, aname->minor, aname->build, aname->revision,
+                                                       vset->major, vset->minor, vset->build, vset->revision
+                                                       );
+                       
+                       memcpy (dest_aname, aname, sizeof(MonoAssemblyName));
+                       dest_aname->major = vset->major;
+                       dest_aname->minor = vset->minor;
+                       dest_aname->build = vset->build;
+                       dest_aname->revision = vset->revision;
+                       return dest_aname;
+               } else if (res < 0) {
+                       last = pos - 1;
+               } else {
+                       first = pos + 1;
+               }
+       }
+       return aname;
+}
+
+/*
+ * mono_assembly_get_assemblyref:
+ *
+ *   Fill out ANAME with the assembly name of the INDEXth assembly reference in IMAGE.
+ */
+void
+mono_assembly_get_assemblyref (MonoImage *image, int index, MonoAssemblyName *aname)
 {
        MonoTableInfo *t;
        guint32 cols [MONO_ASSEMBLYREF_SIZE];
        const char *hash;
-       int i;
-       MonoAssembly **references = NULL;
 
-       *status = MONO_IMAGE_OK;
-       
+       t = &image->tables [MONO_TABLE_ASSEMBLYREF];
+
+       mono_metadata_decode_row (t, index, cols, MONO_ASSEMBLYREF_SIZE);
+               
+       hash = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLYREF_HASH_VALUE]);
+       aname->hash_len = mono_metadata_decode_blob_size (hash, &hash);
+       aname->hash_value = hash;
+       aname->name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]);
+       aname->culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_CULTURE]);
+       aname->flags = cols [MONO_ASSEMBLYREF_FLAGS];
+       aname->major = cols [MONO_ASSEMBLYREF_MAJOR_VERSION];
+       aname->minor = cols [MONO_ASSEMBLYREF_MINOR_VERSION];
+       aname->build = cols [MONO_ASSEMBLYREF_BUILD_NUMBER];
+       aname->revision = cols [MONO_ASSEMBLYREF_REV_NUMBER];
+
+       if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]) {
+               gchar *token = assemblyref_public_tok (image, cols [MONO_ASSEMBLYREF_PUBLIC_KEY], aname->flags);
+               g_strlcpy (aname->public_key_token, token, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+               g_free (token);
+       } else {
+               memset (aname->public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+       }
+}
+
+void
+mono_assembly_load_reference (MonoImage *image, int index)
+{
+       MonoAssembly *reference;
+       MonoAssemblyName aname;
+       MonoImageOpenStatus status;
+
        /*
         * image->references is shared between threads, so we need to access
         * it inside a critical section.
         */
-       EnterCriticalSection (&assemblies_mutex);
-       references = image->references;
-       LeaveCriticalSection (&assemblies_mutex);
-       if (references)
+       mono_assemblies_lock ();
+       reference = image->references [index];
+       mono_assemblies_unlock ();
+       if (reference)
                return;
 
-       t = &image->tables [MONO_TABLE_ASSEMBLYREF];
+       mono_assembly_get_assemblyref (image, index, &aname);
 
-       references = g_new0 (MonoAssembly *, t->rows + 1);
+       if (image->assembly->ref_only) {
+               /* We use the loaded corlib */
+               if (!strcmp (aname.name, "mscorlib"))
+                       reference = mono_assembly_load_full (&aname, image->assembly->basedir, &status, FALSE);
+               else
+                       reference = mono_assembly_loaded_full (&aname, TRUE);
+               /*
+                * Here we must advice that the error was due to
+                * a non loaded reference using the ReflectionOnly api
+               */
+               if (!reference)
+                       reference = (gpointer)-1;
+       } else
+               reference = mono_assembly_load (&aname, image->assembly->basedir, &status);
+
+       if (reference == NULL){
+               char *extra_msg = g_strdup ("");
+
+               if (status == MONO_IMAGE_ERROR_ERRNO && errno == ENOENT) {
+                       extra_msg = g_strdup_printf ("The assembly was not found in the Global Assembly Cache, a path listed in the MONO_PATH environment variable, or in the location of the executing assembly (%s).\n", image->assembly->basedir);
+               } else if (status == MONO_IMAGE_ERROR_ERRNO) {
+                       extra_msg = g_strdup_printf ("System error: %s\n", strerror (errno));
+               } else if (status == MONO_IMAGE_MISSING_ASSEMBLYREF) {
+                       extra_msg = g_strdup ("Cannot find an assembly referenced from this one.\n");
+               } else if (status == MONO_IMAGE_IMAGE_INVALID) {
+                       extra_msg = g_strdup ("The file exists but is not a valid assembly.\n");
+               }
+               
+               g_warning ("The following assembly referenced from %s could not be loaded:\n"
+                                  "     Assembly:   %s    (assemblyref_index=%d)\n"
+                                  "     Version:    %d.%d.%d.%d\n"
+                                  "     Public Key: %s\n%s",
+                                  image->name, aname.name, index,
+                                  aname.major, aname.minor, aname.build, aname.revision,
+                                  strlen(aname.public_key_token) == 0 ? "(none)" : (char*)aname.public_key_token, extra_msg);
+               g_free (extra_msg);
+       }
 
-       /*
-        * Load any assemblies this image references
-        */
-       for (i = 0; i < t->rows; i++) {
-               MonoAssemblyName aname;
+       mono_assemblies_lock ();
+       if (reference == NULL) {
+               /* Flag as not found */
+               reference = (gpointer)-1;
+       }       
 
-               mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
-               
-               hash = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLYREF_HASH_VALUE]);
-               aname.hash_len = mono_metadata_decode_blob_size (hash, &hash);
-               aname.hash_value = hash;
-               aname.name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]);
-               aname.culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_CULTURE]);
-               aname.flags = cols [MONO_ASSEMBLYREF_FLAGS];
-               aname.major = cols [MONO_ASSEMBLYREF_MAJOR_VERSION];
-               aname.minor = cols [MONO_ASSEMBLYREF_MINOR_VERSION];
-               aname.build = cols [MONO_ASSEMBLYREF_BUILD_NUMBER];
-               aname.revision = cols [MONO_ASSEMBLYREF_REV_NUMBER];
-
-               if (cols [MONO_ASSEMBLYREF_PUBLIC_KEY]) {
-                       gchar *token = assemblyref_public_tok (image, cols [MONO_ASSEMBLYREF_PUBLIC_KEY], aname.flags);
-                       g_strlcpy (aname.public_key_token, token, MONO_PUBLIC_KEY_TOKEN_LENGTH);
-                       g_free (token);
-               } else {
-                       memset (aname.public_key_token, 0, MONO_PUBLIC_KEY_TOKEN_LENGTH);
-               } 
-
-               references [i] = mono_assembly_load (&aname, image->assembly->basedir, status);
-
-               if (references [i] == NULL){
-                       int j;
-
-                       /*
-                       ** Temporary work around: any System.* which are 3300 build, will get
-                       ** remapped, this is to keep old applications running that might have
-                       ** been linked against our 5000 API, before we were strongnamed, and
-                       ** hence were labeled as 3300 builds by reflection.c
-                       */
-                       if (aname.build == 3300 && strncmp (aname.name, "System", 6) == 0){
-                               aname.build = 5000;
-                               
-                               references [i] = mono_assembly_load (&aname, image->assembly->basedir, status);
-                       }
-                       if (references [i] != NULL){
-                               if (g_getenv ("MONO_SILENT_WARNING") == NULL)
-                                       g_printerr ("Compat mode: the request from %s to load %s was remapped (http://www.go-mono.com/remap.html)\n",
-                                                image->name, aname.name);
-                               
-                       } else {
-                               char *extra_msg = g_strdup ("");
-
-                               if (*status == MONO_IMAGE_ERROR_ERRNO) {
-                                       extra_msg = g_strdup_printf ("System error: %s\n", strerror (errno));
-                               } else if (*status == MONO_IMAGE_MISSING_ASSEMBLYREF) {
-                                       extra_msg = g_strdup ("Cannot find an assembly referenced from this one.\n");
-                               } else if (*status == MONO_IMAGE_IMAGE_INVALID) {
-                                       extra_msg = g_strdup ("The file exists but is not a valid assembly.\n");
-                               }
-                       
-                               for (j = 0; j < i; j++)
-                                       mono_assembly_close (references [j]);
-                               g_free (references);
-                               
-                               g_warning ("Could not find assembly %s, references from %s (assemblyref_index=%d)\n"
-                                          "     Major/Minor: %d,%d\n"
-                                          "     Build:       %d,%d\n"
-                                          "     Token:       %s\n%s",
-                                          aname.name, image->name, i,
-                                          aname.major, aname.minor, aname.build, aname.revision,
-                                          aname.public_key_token, extra_msg);
-                               *status = MONO_IMAGE_MISSING_ASSEMBLYREF;
-                               g_free (extra_msg);
-                               return;
-                       }
-               }
+       if (!image->references [index]) {
+               mono_assembly_addref (reference);
+               mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Assembly Ref addref %s %p -> %s %p: %d\n", image->assembly->aname.name, image->assembly, reference->aname.name, reference, reference->ref_count);
+               image->references [index] = reference;
+       }
+       mono_assemblies_unlock ();
 
-               /* 
-                * This check is disabled since lots of people seem to have an older
-                * corlib which triggers this.
-                */
-               /* 
-               if (image->references [i]->image == image)
-                       g_error ("Error: Assembly %s references itself", image->name);
-               */
+       if (image->references [index] != reference) {
+               /* Somebody loaded it before us */
+               mono_assembly_close (reference);
        }
-       references [i] = NULL;
+}
+
+void
+mono_assembly_load_references (MonoImage *image, MonoImageOpenStatus *status)
+{
+       MonoTableInfo *t;
+       int i;
+
+       *status = MONO_IMAGE_OK;
+
+       t = &image->tables [MONO_TABLE_ASSEMBLYREF];
+       
+       image->references = g_new0 (MonoAssembly *, t->rows + 1);
 
        /* resolve assembly references for modules */
-       t = &image->tables [MONO_TABLE_MODULEREF];
-       for (i = 0; i < t->rows; i++){
+       for (i = 0; i < image->module_count; i++){
                if (image->modules [i]) {
                        image->modules [i]->assembly = image->assembly;
                        mono_assembly_load_references (image->modules [i], status);
                }
        }
-
-       EnterCriticalSection (&assemblies_mutex);
-       if (!image->references)
-               image->references = references;
-       LeaveCriticalSection (&assemblies_mutex);
-
-       if (image->references != references) {
-               /* Somebody loaded it before us */
-               for (i = 0; i < t->rows; i++)
-                       mono_assembly_close (references [i]);
-               g_free (references);
-       }
 }
 
 typedef struct AssemblyLoadHook AssemblyLoadHook;
@@ -484,36 +947,125 @@ mono_install_assembly_load_hook (MonoAssemblyLoadFunc func, gpointer user_data)
        assembly_load_hook = hook;
 }
 
-typedef struct AssemblyPreLoadHook AssemblyPreLoadHook;
-struct AssemblyPreLoadHook {
-       AssemblyPreLoadHook *next;
-       MonoAssemblyPreLoadFunc func;
+typedef struct AssemblySearchHook AssemblySearchHook;
+struct AssemblySearchHook {
+       AssemblySearchHook *next;
+       MonoAssemblySearchFunc func;
+       gboolean refonly;
+       gboolean postload;
        gpointer user_data;
 };
 
-AssemblyPreLoadHook *assembly_preload_hook = NULL;
+AssemblySearchHook *assembly_search_hook = NULL;
 
-static MonoAssembly *
-invoke_assembly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path)
+static MonoAssembly*
+mono_assembly_invoke_search_hook_internal (MonoAssemblyName *aname, gboolean refonly, gboolean postload)
 {
-       AssemblyPreLoadHook *hook;
-       MonoAssembly *assembly;
+       AssemblySearchHook *hook;
 
-       for (hook = assembly_preload_hook; hook; hook = hook->next) {
-               assembly = hook->func (aname, assemblies_path, hook->user_data);
-               if (assembly != NULL)
-                       return assembly;
+       for (hook = assembly_search_hook; hook; hook = hook->next) {
+               if ((hook->refonly == refonly) && (hook->postload == postload)) {
+                       MonoAssembly *ass = hook->func (aname, hook->user_data);
+                       if (ass)
+                               return ass;
+               }
        }
 
        return NULL;
 }
 
-void
-mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data)
+MonoAssembly*
+mono_assembly_invoke_search_hook (MonoAssemblyName *aname)
 {
-       AssemblyPreLoadHook *hook;
-       
-       g_return_if_fail (func != NULL);
+       return mono_assembly_invoke_search_hook_internal (aname, FALSE, FALSE);
+}
+
+static void
+mono_install_assembly_search_hook_internal (MonoAssemblySearchFunc func, gpointer user_data, gboolean refonly, gboolean postload)
+{
+       AssemblySearchHook *hook;
+       
+       g_return_if_fail (func != NULL);
+
+       hook = g_new0 (AssemblySearchHook, 1);
+       hook->func = func;
+       hook->user_data = user_data;
+       hook->refonly = refonly;
+       hook->postload = postload;
+       hook->next = assembly_search_hook;
+       assembly_search_hook = hook;
+}
+
+void          
+mono_install_assembly_search_hook (MonoAssemblySearchFunc func, gpointer user_data)
+{
+       mono_install_assembly_search_hook_internal (func, user_data, FALSE, FALSE);
+}      
+
+void
+mono_install_assembly_refonly_search_hook (MonoAssemblySearchFunc func, gpointer user_data)
+{
+       mono_install_assembly_search_hook_internal (func, user_data, TRUE, FALSE);
+}
+
+void          
+mono_install_assembly_postload_search_hook (MonoAssemblySearchFunc func, gpointer user_data)
+{
+       mono_install_assembly_search_hook_internal (func, user_data, FALSE, TRUE);
+}      
+
+void
+mono_install_assembly_postload_refonly_search_hook (MonoAssemblySearchFunc func, gpointer user_data)
+{
+       mono_install_assembly_search_hook_internal (func, user_data, TRUE, TRUE);
+}
+
+typedef struct AssemblyPreLoadHook AssemblyPreLoadHook;
+struct AssemblyPreLoadHook {
+       AssemblyPreLoadHook *next;
+       MonoAssemblyPreLoadFunc func;
+       gpointer user_data;
+};
+
+static AssemblyPreLoadHook *assembly_preload_hook = NULL;
+static AssemblyPreLoadHook *assembly_refonly_preload_hook = NULL;
+
+static MonoAssembly *
+invoke_assembly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path)
+{
+       AssemblyPreLoadHook *hook;
+       MonoAssembly *assembly;
+
+       for (hook = assembly_preload_hook; hook; hook = hook->next) {
+               assembly = hook->func (aname, assemblies_path, hook->user_data);
+               if (assembly != NULL)
+                       return assembly;
+       }
+
+       return NULL;
+}
+
+static MonoAssembly *
+invoke_assembly_refonly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path)
+{
+       AssemblyPreLoadHook *hook;
+       MonoAssembly *assembly;
+
+       for (hook = assembly_refonly_preload_hook; hook; hook = hook->next) {
+               assembly = hook->func (aname, assemblies_path, hook->user_data);
+               if (assembly != NULL)
+                       return assembly;
+       }
+
+       return NULL;
+}
+
+void
+mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data)
+{
+       AssemblyPreLoadHook *hook;
+       
+       g_return_if_fail (func != NULL);
 
        hook = g_new0 (AssemblyPreLoadHook, 1);
        hook->func = func;
@@ -522,6 +1074,20 @@ mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_
        assembly_preload_hook = hook;
 }
 
+void
+mono_install_assembly_refonly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data)
+{
+       AssemblyPreLoadHook *hook;
+       
+       g_return_if_fail (func != NULL);
+
+       hook = g_new0 (AssemblyPreLoadHook, 1);
+       hook->func = func;
+       hook->user_data = user_data;
+       hook->next = assembly_refonly_preload_hook;
+       assembly_refonly_preload_hook = hook;
+}
+
 static gchar *
 absolute_dir (const gchar *filename)
 {
@@ -577,66 +1143,62 @@ absolute_dir (const gchar *filename)
        return res;
 }
 
-static MonoImage*
-do_mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
+/** 
+ * mono_assembly_open_from_bundle:
+ * @filename: Filename requested
+ * @status: return value
+ *
+ * This routine tries to open the assembly specified by `filename' from the
+ * defined bundles, if found, returns the MonoImage for it, if not found
+ * returns NULL
+ */
+static MonoImage *
+mono_assembly_open_from_bundle (const char *filename, MonoImageOpenStatus *status, gboolean refonly)
 {
-       MonoImage *image = NULL;
-#ifdef WITH_BUNDLE
        int i;
        char *name = g_path_get_basename (filename);
-       char *dot = strrchr (name, '.');
-       GList *tmp;
-       MonoAssembly *ass;
-       
-       if (dot)
-               *dot = 0;
-       /* we do a very simple search for bundled assemblies: it's not a general 
+       MonoImage *image = NULL;
+
+       /*
+        * we do a very simple search for bundled assemblies: it's not a general 
         * purpose assembly loading mechanism.
         */
-       EnterCriticalSection (&assemblies_mutex);
-       for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
-               ass = tmp->data;
-               if (!ass->aname.name)
-                       continue;
-               if (strcmp (name, ass->aname.name))
-                       continue;
-               image = ass->image;
-               break;
-       }
-
-       for (i = 0; !image && bundled_assemblies [i]; ++i) {
-               if (strcmp (bundled_assemblies [i]->name, name) == 0) {
-                       image = mono_image_open_from_data ((char*)bundled_assemblies [i]->data, bundled_assemblies [i]->size, FALSE, status);
+       mono_assemblies_lock ();
+       for (i = 0; !image && bundles [i]; ++i) {
+               if (strcmp (bundles [i]->name, name) == 0) {
+                       image = mono_image_open_from_data_full ((char*)bundles [i]->data, bundles [i]->size, FALSE, status, refonly);
                        break;
                }
        }
-       LeaveCriticalSection (&assemblies_mutex);
+       mono_assemblies_unlock ();
        g_free (name);
        if (image) {
                mono_image_addref (image);
                return image;
        }
-#endif
-       EnterCriticalSection (&assemblies_mutex);
-       image = mono_image_open (filename, status);
-       LeaveCriticalSection (&assemblies_mutex);
+       return NULL;
+}
+
+static MonoImage*
+do_mono_assembly_open (const char *filename, MonoImageOpenStatus *status, gboolean refonly)
+{
+       MonoImage *image = NULL;
+
+       if (bundles != NULL){
+               image = mono_assembly_open_from_bundle (filename, status, refonly);
+
+               if (image != NULL)
+                       return image;
+       }
+       mono_assemblies_lock ();
+       image = mono_image_open_full (filename, status, refonly);
+       mono_assemblies_unlock ();
 
        return image;
 }
 
-/**
- * mono_assembly_open:
- * @filename: Opens the assembly pointed out by this name
- * @status: where a status code can be returned
- *
- * mono_assembly_open opens the PE-image pointed by @filename, and
- * loads any external assemblies referenced by it.
- *
- * NOTE: we could do lazy loading of the assemblies.  Or maybe not worth
- * it. 
- */
 MonoAssembly *
-mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
+mono_assembly_open_full (const char *filename, MonoImageOpenStatus *status, gboolean refonly)
 {
        MonoImage *image;
        MonoAssembly *ass;
@@ -680,7 +1242,7 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
 
        mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
                        "Assembly Loader probing location: '%s'.", filename);
-       image = do_mono_assembly_open (fname, status);
+       image = do_mono_assembly_open (fname, status, refonly);
 
        if (!image){
                *status = MONO_IMAGE_ERROR_ERRNO;
@@ -688,12 +1250,19 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
                return NULL;
        }
 
-       ass = mono_assembly_load_from (image, fname, status);
+       if (image->assembly) {
+               /* Already loaded by another appdomain */
+               mono_assembly_invoke_load_hook (image->assembly);
+               return image->assembly;
+       }
+
+       ass = mono_assembly_load_from_full (image, fname, status, refonly);
 
        if (ass) {
                mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY,
                                "Assembly Loader loaded assembly from location: '%s'.", filename);
-               mono_config_for_assembly (ass->image);
+               if (!refonly)
+                       mono_config_for_assembly (ass->image);
        }
 
        g_free (fname);
@@ -701,13 +1270,72 @@ mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
        return ass;
 }
 
+/*
+ * load_friend_assemblies:
+ * @ass: an assembly
+ *
+ * Load the list of friend assemblies that are allowed to access
+ * the assembly's internal types and members. They are stored as assembly
+ * names in custom attributes.
+ */
+static void
+load_friend_assemblies (MonoAssembly* ass)
+{
+       int i;
+       MonoCustomAttrInfo* attrs = mono_custom_attrs_from_assembly (ass);
+       if (!attrs)
+               return;
+       for (i = 0; i < attrs->num_attrs; ++i) {
+               MonoCustomAttrEntry *attr = &attrs->attrs [i];
+               MonoAssemblyName *aname;
+               const guchar *data;
+               guint slen;
+               /* Do some sanity checking */
+               if (!attr->ctor || attr->ctor->klass != mono_defaults.internals_visible_class)
+                       continue;
+               if (attr->data_size < 4)
+                       continue;
+               data = attr->data;
+               /* 0xFF means null string, see custom attr format */
+               if (data [0] != 1 || data [1] != 0 || data [2] == 0xFF)
+                       continue;
+               slen = mono_metadata_decode_value (data + 2, &data);
+               aname = g_new0 (MonoAssemblyName, 1);
+               /*g_print ("friend ass: %s\n", data);*/
+               if (mono_assembly_name_parse_full (data, aname, TRUE, NULL)) {
+                       ass->friend_assembly_names = g_slist_prepend (ass->friend_assembly_names, aname);
+               } else {
+                       g_free (aname);
+               }
+       }
+       mono_custom_attrs_free (attrs);
+}
+
+/**
+ * mono_assembly_open:
+ * @filename: Opens the assembly pointed out by this name
+ * @status: where a status code can be returned
+ *
+ * mono_assembly_open opens the PE-image pointed by @filename, and
+ * loads any external assemblies referenced by it.
+ *
+ * NOTE: we could do lazy loading of the assemblies.  Or maybe not worth
+ * it. 
+ */
+MonoAssembly *
+mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
+{
+       return mono_assembly_open_full (filename, status, FALSE);
+}
+
 MonoAssembly *
-mono_assembly_load_from (MonoImage *image, const char*fname, 
-                        MonoImageOpenStatus *status)
+mono_assembly_load_from_full (MonoImage *image, const char*fname, 
+                        MonoImageOpenStatus *status, gboolean refonly)
 {
        MonoAssembly *ass, *ass2;
        char *base_dir;
        GList *loading;
+       GHashTable *ass_loading;
 
 #if defined (PLATFORM_WIN32)
        {
@@ -740,122 +1368,439 @@ mono_assembly_load_from (MonoImage *image, const char*fname,
         */
        ass = g_new0 (MonoAssembly, 1);
        ass->basedir = base_dir;
+       ass->ref_only = refonly;
        ass->image = image;
 
+       mono_image_addref (image);
+
        mono_assembly_fill_assembly_name (image, &ass->aname);
 
+       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Image addref %s %p -> %s %p: %d\n", ass->aname.name, ass, image->name, image, image->ref_count);
+
        /* 
         * Atomically search the loaded list and add ourselves to it if necessary.
         */
-       EnterCriticalSection (&assemblies_mutex);
-       if (ass->aname.name)
+       mono_assemblies_lock ();
+       if (ass->aname.name) {
                /* avoid loading the same assembly twice for now... */
-               if ((ass2 = search_loaded (&ass->aname))) {
+               ass2 = search_loaded (&ass->aname, refonly);
+               if (ass2) {
                        g_free (ass);
                        g_free (base_dir);
                        mono_image_close (image);
                        *status = MONO_IMAGE_OK;
-                       LeaveCriticalSection (&assemblies_mutex);
+                       mono_assemblies_unlock ();
                        return ass2;
                }
-       loading = g_hash_table_lookup (assemblies_loading, GetCurrentThread ());
+       }
+       ass_loading = refonly ? assemblies_refonly_loading : assemblies_loading;
+       loading = g_hash_table_lookup (ass_loading, GetCurrentThread ());
        loading = g_list_prepend (loading, ass);
-       g_hash_table_insert (assemblies_loading, GetCurrentThread (), loading);
-       LeaveCriticalSection (&assemblies_mutex);
+       g_hash_table_insert (ass_loading, GetCurrentThread (), loading);
+       mono_assemblies_unlock ();
 
+       g_assert (image->assembly == NULL);
        image->assembly = ass;
 
-       /*
-        * We load referenced assemblies outside the lock to prevent deadlocks
-        * with regards to preload hooks.
-        */
        mono_assembly_load_references (image, status);
 
-       EnterCriticalSection (&assemblies_mutex);
+       mono_assemblies_lock ();
 
-       loading = g_hash_table_lookup (assemblies_loading, GetCurrentThread ());
+       loading = g_hash_table_lookup (ass_loading, GetCurrentThread ());
        loading = g_list_remove (loading, ass);
        if (loading == NULL)
                /* Prevent memory leaks */
-               g_hash_table_remove (assemblies_loading, GetCurrentThread ());
+               g_hash_table_remove (ass_loading, GetCurrentThread ());
        else
-               g_hash_table_insert (assemblies_loading, GetCurrentThread (), loading);
+               g_hash_table_insert (ass_loading, GetCurrentThread (), loading);
        if (*status != MONO_IMAGE_OK) {
-               LeaveCriticalSection (&assemblies_mutex);
+               mono_assemblies_unlock ();
                mono_assembly_close (ass);
                return NULL;
        }
 
        if (ass->aname.name) {
-               ass2 = search_loaded (&ass->aname);
+               ass2 = search_loaded (&ass->aname, refonly);
                if (ass2) {
                        /* Somebody else has loaded the assembly before us */
-                       LeaveCriticalSection (&assemblies_mutex);
+                       mono_assemblies_unlock ();
                        mono_assembly_close (ass);
                        return ass2;
                }
        }
 
        loaded_assemblies = g_list_prepend (loaded_assemblies, ass);
-       LeaveCriticalSection (&assemblies_mutex);
+       if (mono_defaults.internals_visible_class)
+               load_friend_assemblies (ass);
+       mono_assemblies_unlock ();
 
        mono_assembly_invoke_load_hook (ass);
 
        return ass;
 }
 
+MonoAssembly *
+mono_assembly_load_from (MonoImage *image, const char *fname,
+                        MonoImageOpenStatus *status)
+{
+       return mono_assembly_load_from_full (image, fname, status, FALSE);
+}
+
+/**
+* mono_assembly_name_free:
+* @aname: assembly name to free
+* 
+* Frees the provided assembly name object.
+* (it does not frees the object itself, only the name members).
+*/
+void
+mono_assembly_name_free (MonoAssemblyName *aname)
+{
+       if (aname == NULL)
+               return;
+
+       g_free ((void *) aname->name);
+       g_free ((void *) aname->culture);
+       g_free ((void *) aname->hash_value);
+}
+
+static gboolean
+parse_public_key (const gchar *key, gchar** pubkey)
+{
+       const gchar *pkey;
+       gchar header [16], val, *arr;
+       gint i, j, offset, bitlen, keylen, pkeylen;
+       
+       keylen = strlen (key) >> 1;
+       if (keylen < 1)
+               return FALSE;
+       
+       val = g_ascii_xdigit_value (key [0]) << 4;
+       val |= g_ascii_xdigit_value (key [1]);
+       switch (val) {
+               case 0x00:
+                       if (keylen < 13)
+                               return FALSE;
+                       val = g_ascii_xdigit_value (key [24]);
+                       val |= g_ascii_xdigit_value (key [25]);
+                       if (val != 0x06)
+                               return FALSE;
+                       pkey = key + 24;
+                       break;
+               case 0x06:
+                       pkey = key;
+                       break;
+               default:
+                       return FALSE;
+       }
+               
+       /* We need the first 16 bytes
+       * to check whether this key is valid or not */
+       pkeylen = strlen (pkey) >> 1;
+       if (pkeylen < 16)
+               return FALSE;
+               
+       for (i = 0, j = 0; i < 16; i++) {
+               header [i] = g_ascii_xdigit_value (pkey [j++]) << 4;
+               header [i] |= g_ascii_xdigit_value (pkey [j++]);
+       }
+
+       if (header [0] != 0x06 || /* PUBLICKEYBLOB (0x06) */
+                       header [1] != 0x02 || /* Version (0x02) */
+                       header [2] != 0x00 || /* Reserved (word) */
+                       header [3] != 0x00 ||
+                       (guint)(read32 (header + 8)) != 0x31415352) /* DWORD magic = RSA1 */
+               return FALSE;
+
+       /* Based on this length, we _should_ be able to know if the length is right */
+       bitlen = read32 (header + 12) >> 3;
+       if ((bitlen + 16 + 4) != pkeylen)
+               return FALSE;
+               
+       /* Encode the size of the blob */
+       offset = 0;
+       if (keylen <= 127) {
+               arr = g_malloc (keylen + 1);
+               arr [offset++] = keylen;
+       } else {
+               arr = g_malloc (keylen + 2);
+               arr [offset++] = 0x80; /* 10bs */
+               arr [offset++] = keylen;
+       }
+               
+       for (i = offset, j = 0; i < keylen + offset; i++) {
+               arr [i] = g_ascii_xdigit_value (key [j++]) << 4;
+               arr [i] |= g_ascii_xdigit_value (key [j++]);
+       }
+       if (pubkey)
+               *pubkey = arr;
+
+       return TRUE;
+}
+
+static gboolean
+build_assembly_name (const char *name, const char *version, const char *culture, const char *token, const char *key, MonoAssemblyName *aname, gboolean save_public_key)
+{
+       gint major, minor, build, revision;
+       gint len;
+       gchar *pkey, *pkeyptr, *encoded, tok [8];
+
+       memset (aname, 0, sizeof (MonoAssemblyName));
+
+       if (version) {
+               if (sscanf (version, "%u.%u.%u.%u", &major, &minor, &build, &revision) != 4)
+                       return FALSE;
+
+               aname->major = major;
+               aname->minor = minor;
+               aname->build = build;
+               aname->revision = revision;
+       }
+       
+       aname->name = g_strdup (name);
+       
+       if (culture) {
+               if (g_ascii_strcasecmp (culture, "neutral") == 0)
+                       aname->culture = g_strdup ("");
+               else
+                       aname->culture = g_strdup (culture);
+       }
+       
+       if (token && strncmp (token, "null", 4) != 0) {
+               char *lower = g_ascii_strdown (token, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+               g_strlcpy ((char*)aname->public_key_token, lower, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+               g_free (lower);
+       }
+
+       if (key && strncmp (key, "null", 4) != 0) {
+               if (!parse_public_key (key, &pkey)) {
+                       mono_assembly_name_free (aname);
+                       return FALSE;
+               }
+               
+               len = mono_metadata_decode_blob_size ((const gchar *) pkey, (const gchar **) &pkeyptr);
+               // We also need to generate the key token
+               mono_digest_get_public_token ((guchar*) tok, (guint8*) pkeyptr, len);
+               encoded = encode_public_tok ((guchar*) tok, 8);
+               g_strlcpy ((gchar*)aname->public_key_token, encoded, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+               g_free (encoded);
+
+               if (save_public_key)
+                       aname->public_key = (guint8*) pkey;
+               else
+                       g_free (pkey);
+       }
+       
+       return TRUE;
+}
+
+static gboolean
+parse_assembly_directory_name (const char *name, const char *dirname, MonoAssemblyName *aname)
+{
+       gchar **parts;
+       gboolean res;
+       
+       parts = g_strsplit (dirname, "_", 3);
+       if (!parts || !parts[0] || !parts[1] || !parts[2]) {
+               g_strfreev (parts);
+               return FALSE;
+       }
+       
+       res = build_assembly_name (name, parts[0], parts[1], parts[2], NULL, aname, FALSE);
+       g_strfreev (parts);
+       return res;
+}
+
+gboolean
+mono_assembly_name_parse_full (const char *name, MonoAssemblyName *aname, gboolean save_public_key, gboolean *is_version_defined)
+{
+       gchar *dllname;
+       gchar *version = NULL;
+       gchar *culture = NULL;
+       gchar *token = NULL;
+       gchar *key = NULL;
+       gboolean res;
+       gchar *value;
+       gchar **parts;
+       gchar **tmp;
+       gboolean version_defined;
+
+       if (!is_version_defined)
+               is_version_defined = &version_defined;
+       *is_version_defined = FALSE;
+       
+       parts = tmp = g_strsplit (name, ",", 4);
+       if (!tmp || !*tmp) {
+               g_strfreev (tmp);
+               return FALSE;
+       }
+
+       dllname = g_strstrip (*tmp);
+       
+       tmp++;
+
+       while (*tmp) {
+               value = g_strstrip (*tmp);
+               if (!g_ascii_strncasecmp (value, "Version=", 8)) {
+                       *is_version_defined = TRUE;
+                       version = g_strstrip (value + 8);
+                       tmp++;
+                       continue;
+               }
+
+               if (!g_ascii_strncasecmp (value, "Culture=", 8)) {
+                       culture = g_strstrip (value + 8);
+                       tmp++;
+                       continue;
+               }
+
+               if (!g_ascii_strncasecmp (value, "PublicKeyToken=", 15)) {
+                       token = g_strstrip (value + 15);
+                       tmp++;
+                       continue;
+               }
+
+               if (!g_ascii_strncasecmp (value, "PublicKey=", 10)) {
+                       key = g_strstrip (value + 10);
+                       tmp++;
+                       continue;
+               }
+               
+               g_strfreev (parts);
+               return FALSE;
+       }
+
+       res = build_assembly_name (dllname, version, culture, token, key, aname, save_public_key);
+       g_strfreev (parts);
+       return res;
+}
+
+/**
+* mono_assembly_name_parse:
+* @name: name to parse
+* @aname: the destination assembly name
+* Returns: true if the name could be parsed.
+* 
+* Parses an assembly qualified type name and assigns the name,
+* version, culture and token to the provided assembly name object.
+*/
+gboolean
+mono_assembly_name_parse (const char *name, MonoAssemblyName *aname)
+{
+       return mono_assembly_name_parse_full (name, aname, FALSE, NULL);
+}
+
 static MonoAssembly*
-probe_for_partial_name (const char *basepath, const char *fullname, MonoImageOpenStatus *status)
+probe_for_partial_name (const char *basepath, const char *fullname, MonoAssemblyName *aname, MonoImageOpenStatus *status)
 {
-       MonoAssembly *res = NULL;
-       gchar *fullpath;
+       gchar *fullpath = NULL;
        GDir *dirhandle;
        const char* direntry;
-
+       MonoAssemblyName gac_aname;
+       gint major=-1, minor=0, build=0, revision=0;
+       gboolean exact_version;
+       
        dirhandle = g_dir_open (basepath, 0, NULL);
        if (!dirhandle)
                return NULL;
+               
+       exact_version = (aname->major | aname->minor | aname->build | aname->revision) != 0;
 
        while ((direntry = g_dir_read_name (dirhandle))) {
-               fullpath = g_build_path (G_DIR_SEPARATOR_S, basepath, direntry, fullname, NULL);
-               res = mono_assembly_open (fullpath, status);
-               g_free (fullpath);
-               if (res)
-                       break;
+               gboolean match = TRUE;
+               
+               parse_assembly_directory_name (aname->name, direntry, &gac_aname);
+               
+               if (aname->culture != NULL && strcmp (aname->culture, gac_aname.culture) != 0)
+                       match = FALSE;
+                       
+               if (match && strlen ((char*)aname->public_key_token) > 0 && 
+                               strcmp ((char*)aname->public_key_token, (char*)gac_aname.public_key_token) != 0)
+                       match = FALSE;
+               
+               if (match) {
+                       if (exact_version) {
+                               match = (aname->major == gac_aname.major && aname->minor == gac_aname.minor &&
+                                                aname->build == gac_aname.build && aname->revision == gac_aname.revision); 
+                       }
+                       else if (gac_aname.major < major)
+                               match = FALSE;
+                       else if (gac_aname.major == major) {
+                               if (gac_aname.minor < minor)
+                                       match = FALSE;
+                               else if (gac_aname.minor == minor) {
+                                       if (gac_aname.build < build)
+                                               match = FALSE;
+                                       else if (gac_aname.build == build && gac_aname.revision <= revision)
+                                               match = FALSE; 
+                               }
+                       }
+               }
+               
+               if (match) {
+                       major = gac_aname.major;
+                       minor = gac_aname.minor;
+                       build = gac_aname.build;
+                       revision = gac_aname.revision;
+                       g_free (fullpath);
+                       fullpath = g_build_path (G_DIR_SEPARATOR_S, basepath, direntry, fullname, NULL);
+               }
+
+               mono_assembly_name_free (&gac_aname);
        }
+       
        g_dir_close (dirhandle);
-
-       return res;
+       
+       if (fullpath == NULL)
+               return NULL;
+       else {
+               MonoAssembly *res = mono_assembly_open (fullpath, status);
+               g_free (fullpath);
+               return res;
+       }
 }
 
 MonoAssembly*
 mono_assembly_load_with_partial_name (const char *name, MonoImageOpenStatus *status)
 {
        MonoAssembly *res;
-       MonoAssemblyName aname;
+       MonoAssemblyName *aname, base_name, maped_aname;
        gchar *fullname, *gacpath;
        gchar **paths;
 
-       memset (&aname, 0, sizeof (MonoAssemblyName));
-       aname.name = name;
+       memset (&base_name, 0, sizeof (MonoAssemblyName));
+       aname = &base_name;
 
-       res = invoke_assembly_preload_hook (&aname, assemblies_path);
+       if (!mono_assembly_name_parse (name, aname))
+               return NULL;
+
+       /* 
+        * If no specific version has been requested, make sure we load the
+        * correct version for system assemblies.
+        */ 
+       if ((aname->major | aname->minor | aname->build | aname->revision) == 0)
+               aname = mono_assembly_remap_version (aname, &maped_aname);
+       
+       res = mono_assembly_loaded (aname);
        if (res) {
-               res->in_gac = FALSE;
+               mono_assembly_name_free (aname);
                return res;
        }
 
-       res = mono_assembly_loaded (&aname);
-       if (res)
+       res = invoke_assembly_preload_hook (aname, assemblies_path);
+       if (res) {
+               res->in_gac = FALSE;
+               mono_assembly_name_free (aname);
                return res;
+       }
 
-       fullname = g_strdup_printf ("%s.dll", name);
+       fullname = g_strdup_printf ("%s.dll", aname->name);
 
        if (extra_gac_paths) {
                paths = extra_gac_paths;
                while (!res && *paths) {
-                       gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", name, NULL);
-                       res = probe_for_partial_name (gacpath, fullname, status);
+                       gacpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", aname->name, NULL);
+                       res = probe_for_partial_name (gacpath, fullname, aname, status);
                        g_free (gacpath);
                        paths++;
                }
@@ -864,36 +1809,180 @@ mono_assembly_load_with_partial_name (const char *name, MonoImageOpenStatus *sta
        if (res) {
                res->in_gac = TRUE;
                g_free (fullname);
+               mono_assembly_name_free (aname);
                return res;
-               
        }
 
-       gacpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), "mono", "gac", name, NULL);
-       res = probe_for_partial_name (gacpath, fullname, status);
+       gacpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), "mono", "gac", aname->name, NULL);
+       res = probe_for_partial_name (gacpath, fullname, aname, status);
        g_free (gacpath);
 
        if (res)
                res->in_gac = TRUE;
 
        g_free (fullname);
+       mono_assembly_name_free (aname);
 
        return res;
 }
 
+static MonoImage*
+mono_assembly_load_publisher_policy (MonoAssemblyName *aname)
+{
+       MonoImage *image;
+       gchar *filename, *pname, *name, *culture, *version, *fullpath, *subpath;
+       gchar **paths;
+       gint32 len;
+
+       if (strstr (aname->name, ".dll")) {
+               len = strlen (aname->name) - 4;
+               name = g_malloc (len);
+               strncpy (name, aname->name, len);
+       } else
+               name = g_strdup (aname->name);
+       
+       if (aname->culture) {
+               culture = g_strdup (aname->culture);
+               g_strdown (culture);
+       } else
+               culture = g_strdup ("");
+       
+       pname = g_strdup_printf ("policy.%d.%d.%s", aname->major, aname->minor, name);
+       version = g_strdup_printf ("0.0.0.0_%s_%s", culture, aname->public_key_token);
+       g_free (name);
+       g_free (culture);
+       
+       filename = g_strconcat (pname, ".dll", NULL);
+       subpath = g_build_path (G_DIR_SEPARATOR_S, pname, version, filename, NULL);
+       g_free (pname);
+       g_free (version);
+       g_free (filename);
+
+       image = NULL;
+       if (extra_gac_paths) {
+               paths = extra_gac_paths;
+               while (!image && *paths) {
+                       fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths,
+                                       "lib", "mono", "gac", subpath, NULL);
+                       image = mono_image_open (fullpath, NULL);
+                       g_free (fullpath);
+                       paths++;
+               }
+       }
+
+       if (image) {
+               g_free (subpath);
+               return image;
+       }
+
+       fullpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (), 
+                       "mono", "gac", subpath, NULL);
+       image = mono_image_open (fullpath, NULL);
+       g_free (subpath);
+       g_free (fullpath);
+       
+       return image;
+}
+
+static MonoAssemblyName*
+mono_assembly_bind_version (MonoAssemblyBindingInfo *info, MonoAssemblyName *aname, MonoAssemblyName *dest_name)
+{
+       memcpy (dest_name, aname, sizeof (MonoAssemblyName));
+       dest_name->major = info->new_version.major;
+       dest_name->minor = info->new_version.minor;
+       dest_name->build = info->new_version.build;
+       dest_name->revision = info->new_version.revision;
+       
+       return dest_name;
+}
+
+/* LOCKING: Assumes that we are already locked */
+static MonoAssemblyBindingInfo*
+search_binding_loaded (MonoAssemblyName *aname)
+{
+       GSList *tmp;
+
+       for (tmp = loaded_assembly_bindings; tmp; tmp = tmp->next) {
+               MonoAssemblyBindingInfo *info = tmp->data;
+               if (assembly_binding_maps_name (info, aname))
+                       return info;
+       }
+
+       return NULL;
+}
+
+static MonoAssemblyName*
+mono_assembly_apply_binding (MonoAssemblyName *aname, MonoAssemblyName *dest_name)
+{
+       MonoAssemblyBindingInfo *info, *info2;
+       MonoImage *ppimage;
+
+       if (aname->public_key_token [0] == 0)
+               return aname;
+
+       mono_loader_lock ();
+       info = search_binding_loaded (aname);
+       mono_loader_unlock ();
+       if (info) {
+               if (!check_policy_versions (info, aname))
+                       return aname;
+               
+               mono_assembly_bind_version (info, aname, dest_name);
+               return dest_name;
+       }
+
+       info = g_new0 (MonoAssemblyBindingInfo, 1);
+       info->major = aname->major;
+       info->minor = aname->minor;
+       
+       ppimage = mono_assembly_load_publisher_policy (aname);
+       if (ppimage) {
+               get_publisher_policy_info (ppimage, aname, info);
+               mono_image_close (ppimage);
+       }
+
+       /* Define default error value if needed */
+       if (!info->is_valid) {
+               info->name = g_strdup (aname->name);
+               info->culture = g_strdup (aname->culture);
+               g_strlcpy ((char *)info->public_key_token, (const char *)aname->public_key_token, MONO_PUBLIC_KEY_TOKEN_LENGTH);
+       }
+       
+       mono_loader_lock ();
+       info2 = search_binding_loaded (aname);
+       if (info2) {
+               /* This binding was added by another thread 
+                * before us */
+               mono_assembly_binding_info_free (info);
+               g_free (info);
+               
+               info = info2;
+       } else
+               loaded_assembly_bindings = g_slist_prepend (loaded_assembly_bindings, info);
+               
+       mono_loader_unlock ();
+       
+       if (!info->is_valid || !check_policy_versions (info, aname))
+               return aname;
+
+       mono_assembly_bind_version (info, aname, dest_name);
+       return dest_name;
+}
+
 /**
  * mono_assembly_load_from_gac
  *
  * @aname: The assembly name object
  */
 static MonoAssembly*
-mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImageOpenStatus *status)
+mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImageOpenStatus *status, MonoBoolean refonly)
 {
        MonoAssembly *result = NULL;
        gchar *name, *version, *culture, *fullpath, *subpath;
        gint32 len;
        gchar **paths;
 
-       if (aname->public_key_token [0] == NULL) {
+       if (aname->public_key_token [0] == 0) {
                return NULL;
        }
 
@@ -925,7 +2014,7 @@ mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImag
                paths = extra_gac_paths;
                while (!result && *paths) {
                        fullpath = g_build_path (G_DIR_SEPARATOR_S, *paths, "lib", "mono", "gac", subpath, NULL);
-                       result = mono_assembly_open (fullpath, status);
+                       result = mono_assembly_open_full (fullpath, status, refonly);
                        g_free (fullpath);
                        paths++;
                }
@@ -939,7 +2028,7 @@ mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImag
 
        fullpath = g_build_path (G_DIR_SEPARATOR_S, mono_assembly_getrootdir (),
                        "mono", "gac", subpath, NULL);
-       result = mono_assembly_open (fullpath, status);
+       result = mono_assembly_open_full (fullpath, status, refonly);
        g_free (fullpath);
 
        if (result)
@@ -950,107 +2039,182 @@ mono_assembly_load_from_gac (MonoAssemblyName *aname,  gchar *filename, MonoImag
        return result;
 }
 
-       
+
 MonoAssembly*
-mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status)
+mono_assembly_load_corlib (const MonoRuntimeInfo *runtime, MonoImageOpenStatus *status)
 {
-       MonoAssembly *result;
-       char *fullpath, *filename;
+       char *corlib_file;
 
-       result = invoke_assembly_preload_hook (aname, assemblies_path);
-       if (result) {
-               result->in_gac = FALSE;
-               return result;
+       if (corlib) {
+               /* g_print ("corlib already loaded\n"); */
+               return corlib;
+       }
+       
+       if (assemblies_path) {
+               corlib = load_in_path ("mscorlib.dll", (const char**)assemblies_path, status, FALSE);
+               if (corlib)
+                       return corlib;
        }
 
-       result = mono_assembly_loaded (aname);
-       if (result)
-               return result;
-
-       /* g_print ("loading %s\n", aname->name); */
-       /* special case corlib */
-       if (strcmp (aname->name, "mscorlib") == 0) {
+       /* Load corlib from mono/<version> */
+       
+       corlib_file = g_build_filename ("mono", runtime->framework_version, "mscorlib.dll", NULL);
+       if (assemblies_path) {
+               corlib = load_in_path (corlib_file, (const char**)assemblies_path, status, FALSE);
                if (corlib) {
-                       /* g_print ("corlib already loaded\n"); */
+                       g_free (corlib_file);
                        return corlib;
                }
-               /* g_print ("corlib load\n"); */
-               if (assemblies_path) {
-                       corlib = load_in_path ("mscorlib.dll", (const char**)assemblies_path, status);
-                       if (corlib)
-                               return corlib;
-               }
-               corlib = load_in_path ("mscorlib.dll", default_path, status);
-               return corlib;
        }
+       corlib = load_in_path (corlib_file, default_path, status, FALSE);
+       g_free (corlib_file);
 
-       if (strstr (aname->name, ".dll"))
-               filename = g_strdup (aname->name);
-       else
-               filename = g_strconcat (aname->name, ".dll", NULL);
+       return corlib;
+}
+
+
+MonoAssembly*
+mono_assembly_load_full (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status, gboolean refonly)
+{
+       MonoAssembly *result;
+       char *fullpath, *filename;
+       MonoAssemblyName maped_aname, maped_name_pp;
+       int ext_index;
+       const char *ext;
 
-       result = mono_assembly_load_from_gac (aname, filename, status);
+       aname = mono_assembly_remap_version (aname, &maped_aname);
+       
+       /* Reflection only assemblies don't get assembly binding */
+       if (!refonly)
+               aname = mono_assembly_apply_binding (aname, &maped_name_pp);
+       
+       result = mono_assembly_loaded_full (aname, refonly);
+       if (result)
+               return result;
+
+       result = refonly ? invoke_assembly_refonly_preload_hook (aname, assemblies_path) : invoke_assembly_preload_hook (aname, assemblies_path);
        if (result) {
-               g_free (filename);
+               result->in_gac = FALSE;
                return result;
        }
 
-       if (basedir) {
-               fullpath = g_build_filename (basedir, filename, NULL);
-               result = mono_assembly_open (fullpath, status);
-               g_free (fullpath);
+       /* Currently we retrieve the loaded corlib for reflection 
+        * only requests, like a common reflection only assembly 
+        */
+       if (strcmp (aname->name, "mscorlib") == 0 || strcmp (aname->name, "mscorlib.dll") == 0) {
+               return mono_assembly_load_corlib (mono_get_runtime_info (), status);
+       }
+
+       for (ext_index = 0; ext_index < 2; ext_index ++) {
+               ext = ext_index == 0 ? ".dll" : ".exe";
+               if (strstr (aname->name, ".dll"))
+                       filename = g_strdup (aname->name);
+               else
+                       filename = g_strconcat (aname->name, ext, NULL);
+
+               result = mono_assembly_load_from_gac (aname, filename, status, refonly);
                if (result) {
-                       result->in_gac = FALSE;
                        g_free (filename);
                        return result;
                }
+
+               if (basedir) {
+                       fullpath = g_build_filename (basedir, filename, NULL);
+                       result = mono_assembly_open_full (fullpath, status, refonly);
+                       g_free (fullpath);
+                       if (result) {
+                               result->in_gac = FALSE;
+                               g_free (filename);
+                               return result;
+                       }
+               }
+
+               result = load_in_path (filename, default_path, status, refonly);
+               if (result)
+                       result->in_gac = FALSE;
+               g_free (filename);
+               if (result)
+                       return result;
        }
 
-       result = load_in_path (filename, default_path, status);
-       if (result)
-               result->in_gac = FALSE;
-       g_free (filename);
+       /* Try a postload search hook */
+       result = mono_assembly_invoke_search_hook_internal (aname, refonly, TRUE);
+
        return result;
 }
 
 MonoAssembly*
-mono_assembly_loaded (MonoAssemblyName *aname)
+mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status)
+{
+       return mono_assembly_load_full (aname, basedir, status, FALSE);
+}
+       
+MonoAssembly*
+mono_assembly_loaded_full (MonoAssemblyName *aname, gboolean refonly)
 {
        MonoAssembly *res;
+       MonoAssemblyName maped_aname;
+
+       aname = mono_assembly_remap_version (aname, &maped_aname);
 
-       EnterCriticalSection (&assemblies_mutex);
-       res = search_loaded (aname);
-       LeaveCriticalSection (&assemblies_mutex);
+       mono_assemblies_lock ();
+       res = search_loaded (aname, refonly);
+       mono_assemblies_unlock ();
 
        return res;
 }
 
+MonoAssembly*
+mono_assembly_loaded (MonoAssemblyName *aname)
+{
+       return mono_assembly_loaded_full (aname, FALSE);
+}
+
+/**
+ * mono_assembly_close:
+ * @assembly: the assembly to release.
+ *
+ * This method releases a reference to the @assembly.  The assembly is
+ * only released when all the outstanding references to it are released.
+ */
 void
 mono_assembly_close (MonoAssembly *assembly)
 {
-       MonoImage *image;
-       int i;
-       
+       GSList *tmp;
        g_return_if_fail (assembly != NULL);
 
-       EnterCriticalSection (&assemblies_mutex);
-       if (--assembly->ref_count != 0) {
-               LeaveCriticalSection (&assemblies_mutex);
+       /* Might be 0 already */
+       if (InterlockedDecrement (&assembly->ref_count) > 0)
                return;
-       }
+
+       mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading assembly %s [%p].", assembly->aname.name, assembly);
+
+       mono_assemblies_lock ();
        loaded_assemblies = g_list_remove (loaded_assemblies, assembly);
-       LeaveCriticalSection (&assemblies_mutex);
-       image = assembly->image;
-       if (image->references) {
-               for (i = 0; image->references [i] != NULL; i++)
-                       mono_image_close (image->references [i]->image);
-               g_free (image->references);
+       mono_assemblies_unlock ();
+
+       if (assembly->image->references) {
+               int i;
+
+               for (i = 0; assembly->image->references [i]; i++) {
+                       if (assembly->image->references [i])
+                               mono_assembly_close (assembly->image->references [i]);
+               }
        }
 
+       assembly->image->assembly = NULL;
+
        mono_image_close (assembly->image);
 
+       for (tmp = assembly->friend_assembly_names; tmp; tmp = tmp->next) {
+               MonoAssemblyName *fname = tmp->data;
+               mono_assembly_name_free (fname);
+               g_free (fname);
+       }
+       g_slist_free (assembly->friend_assembly_names);
        g_free (assembly->basedir);
-       g_free (assembly);
+       if (!assembly->dynamic)
+               g_free (assembly);
 }
 
 MonoImage*
@@ -1072,19 +2236,20 @@ mono_assembly_foreach (GFunc func, gpointer user_data)
        GList *copy;
 
        /*
-     * We make a copy of the list to avoid calling the callback inside the 
+        * We make a copy of the list to avoid calling the callback inside the 
         * lock, which could lead to deadlocks.
         */
-       EnterCriticalSection (&assemblies_mutex);
+       mono_assemblies_lock ();
        copy = g_list_copy (loaded_assemblies);
-       LeaveCriticalSection (&assemblies_mutex);
+       mono_assemblies_unlock ();
 
        g_list_foreach (loaded_assemblies, func, user_data);
 
        g_list_free (copy);
 }
 
-/* Holds the assembly of the application, for
+/*
+ * Holds the assembly of the application, for
  * System.Diagnostics.Process::MainModule
  */
 static MonoAssembly *main_assembly=NULL;
@@ -1101,9 +2266,16 @@ mono_assembly_get_main (void)
        return(main_assembly);
 }
 
+/*
+ */
 MonoImage*
 mono_assembly_get_image (MonoAssembly *assembly)
 {
        return assembly->image;
 }
 
+void
+mono_register_bundled_assemblies (const MonoBundledAssembly **assemblies)
+{
+       bundles = assemblies;
+}