2010-07-12 Rodrigo Kumpera <rkumpera@novell.com>

[mono.git] / mono / metadata / assembly.c

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index 5e44803502236f42f673515d79f85695563fd492..29ef8580add944c3bf2f4eab668bda3b01a1623a 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -91,8 +91,11 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"Npgsql", 0},
        {"PEAPI", 0},
        {"System", 0},
+       {"System.ComponentModel.DataAnnotations", 2},
        {"System.Configuration.Install", 0},
+       {"System.Core", 2},
        {"System.Data", 0},
+       {"System.Data.Linq", 2},
        {"System.Data.OracleClient", 0},
        {"System.Data.SqlXml", 0},
        {"System.Design", 0},
@@ -107,7 +110,10 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"System.Security", 0},
        {"System.ServiceProcess", 0},
        {"System.Web", 0},
+       {"System.Web.Abstractions", 2},
+       {"System.Web.Extensions", 2},
        {"System.Web.Mobile", 0},
+       {"System.Web.Routing", 2},
        {"System.Web.Services", 0},
        {"System.Windows.Forms", 0},
        {"System.Xml", 0},
@@ -245,7 +251,7 @@ assembly_binding_maps_name (MonoAssemblyBindingInfo *info, MonoAssemblyName *ana
        if ((info->culture != NULL && info->culture [0]) != (aname->culture != NULL && aname->culture [0])) 
                return FALSE;
        
-       if (info->culture && strcmp (info->culture, aname->culture))
+       if (info->culture && aname->culture && strcmp (info->culture, aname->culture))
                return FALSE;
        
        if (!mono_public_tokens_are_equal (info->public_key_token, aname->public_key_token))
@@ -592,10 +598,14 @@ mono_set_rootdir (void)
        root = g_build_path (G_DIR_SEPARATOR_S, installdir, "lib", NULL);
 
        config = g_build_filename (root, "..", "etc", NULL);
+#ifdef HOST_WIN32
+       mono_set_dirs (root, config);
+#else
        if (g_file_test (root, G_FILE_TEST_EXISTS) && g_file_test (config, G_FILE_TEST_EXISTS))
                mono_set_dirs (root, config);
        else
                fallback ();
+#endif
 
        g_free (config);
        g_free (root);
@@ -902,7 +912,7 @@ mono_assembly_load_reference (MonoImage *image, int index)
                        extra_msg = g_strdup ("");
                }
                
-               g_warning ("The following assembly referenced from %s could not be loaded:\n"
+               mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_ASSEMBLY, "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",