projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 a33d726d3a6d7c1b1f6c96c03dde229f002c477a..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},
{"Npgsql", 0},
{"PEAPI", 0},
{"System", 0},
+ {"System.ComponentModel.DataAnnotations", 2},
{"System.Configuration.Install", 0},
{"System.Configuration.Install", 0},
+ {"System.Core", 2},
{"System.Data", 0},
{"System.Data", 0},
+ {"System.Data.Linq", 2},
{"System.Data.OracleClient", 0},
{"System.Data.SqlXml", 0},
{"System.Design", 0},
{"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.Security", 0},
{"System.ServiceProcess", 0},
{"System.Web", 0},
+ {"System.Web.Abstractions", 2},
+ {"System.Web.Extensions", 2},
{"System.Web.Mobile", 0},
{"System.Web.Mobile", 0},
+ {"System.Web.Routing", 2},
{"System.Web.Services", 0},
{"System.Windows.Forms", 0},
{"System.Xml", 0},
{"System.Web.Services", 0},
{"System.Windows.Forms", 0},
{"System.Xml", 0},
@@
-906,7
+912,7
@@
mono_assembly_load_reference (MonoImage *image, int index)
extra_msg = g_strdup ("");
}
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",
" Assembly: %s (assemblyref_index=%d)\n"
" Version: %d.%d.%d.%d\n"
" Public Key: %s\n%s",