2010-06-29 Rodrigo Kumpera <rkumpera@novell.com>

	* assembly.c: Revert r159692 since it breaks loading 3.5
	assemblies under 2.0.

svn path=/trunk/mono/; revision=159699

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 2ec21eefed132f958066cacf9fd47e7c19e66095..185170e2125844154cdb56a8effb068f3d9eecb3 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-29 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * assembly.c: Revert r159692 since it breaks loading 3.5
+       assemblies under 2.0.
+
 2010-06-29 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * icall.c (ves_icall_Type_make_array_type): Raise a TLE if a

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index dbd34706bf7679885df6a6692cb6bb48fa63636a..a33d726d3a6d7c1b1f6c96c03dde229f002c477a 100644 (file)
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -91,11 +91,8 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"Npgsql", 0},
        {"PEAPI", 0},
        {"System", 0},
-       {"System.ComponentModel.DataAnnotations", 0},
        {"System.Configuration.Install", 0},
-       {"System.Core", 0},
        {"System.Data", 0},
-       {"System.Data.Linq", 0},
        {"System.Data.OracleClient", 0},
        {"System.Data.SqlXml", 0},
        {"System.Design", 0},
@@ -110,10 +107,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"System.Security", 0},
        {"System.ServiceProcess", 0},
        {"System.Web", 0},
-       {"System.Web.Abstractions", 0},
-       {"System.Web.Extensions", 0},
        {"System.Web.Mobile", 0},
-       {"System.Web.Routing", 0},
        {"System.Web.Services", 0},
        {"System.Windows.Forms", 0},
        {"System.Xml", 0},