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

	* assembly.c (framework_assemblies): Add 3.5 assemblies.

	* domain-internals.h (MonoRuntimeInfo): Increase version_sets
	by one to have room to remap 3.5 assemblies.

	* domain.c (supported_runtimes): Add 3.5 remapping information.

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

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 191b596a30414be014e654b60a97186355d3d7c8..3887de1fad49d3a25e4048506e7d0e6e304e570e 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,12 @@
+2010-06-30 Rodrigo Kumpera  <rkumpera@novell.com>
+
+       * assembly.c (framework_assemblies): Add 3.5 assemblies.
+
+       * domain-internals.h (MonoRuntimeInfo): Increase version_sets
+       by one to have room to remap 3.5 assemblies.
+
+       * domain.c (supported_runtimes): Add 3.5 remapping information.
+
 2010-06-30 Rodrigo Kumpera  <rkumpera@novell.com>
 
        * reflection.c (mono_image_create_token): Handle a

diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index a33d726d3a6d7c1b1f6c96c03dde229f002c477a..6a6959dd5ab2d08d4bfbb58be47f86ea70258c31 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},

diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h
index 37998c8459e5ae61d2bb43636b04bd68aab32f62..28378b3c76c791bd8d72b3669b5e225199701d42 100644 (file)
--- a/mono/metadata/domain-internals.h
+++ b/mono/metadata/domain-internals.h
@@ -325,7 +325,7 @@ typedef struct  {
 typedef struct  {
        const char runtime_version [12];
        const char framework_version [4];
-       const AssemblyVersionSet version_sets [2];
+       const AssemblyVersionSet version_sets [3];
 } MonoRuntimeInfo;
 
 #define mono_domain_lock(domain) mono_locks_acquire(&(domain)->lock, DomainLock)

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index 26f75788907f09e772b356d007c186c04a6133ee..7ddd2082eb15549ea2efffcfdc9e21b3479853ed 100644 (file)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -128,11 +128,11 @@ static MonoAotModuleInfoTable *aot_modules = NULL;
 /* This is the list of runtime versions supported by this JIT.
  */
 static const MonoRuntimeInfo supported_runtimes[] = {
-       {"v2.0.50215","2.0", { {2,0,0,0},    {8,0,0,0} }        },
-       {"v2.0.50727","2.0", { {2,0,0,0},    {8,0,0,0} }        },
-       {"v4.0.30128","4.0", { {4,0,0,0},    {10,0,0,0} }   },
-       {"v4.0.30319","4.0", { {4,0,0,0},    {10,0,0,0} }   },
-       {"moonlight", "2.1", { {2,0,5,0},    {9,0,0,0} }    },
+       {"v2.0.50215","2.0", { {2,0,0,0},    {8,0,0,0}, { 3, 5, 0, 0 } }        },
+       {"v2.0.50727","2.0", { {2,0,0,0},    {8,0,0,0}, { 3, 5, 0, 0 } }        },
+       {"v4.0.30128","4.0", { {4,0,0,0},    {10,0,0,0}, { 4, 0, 0, 0 } }   },
+       {"v4.0.30319","4.0", { {4,0,0,0},    {10,0,0,0}, { 4, 0, 0, 0 } }   },
+       {"moonlight", "2.1", { {2,0,5,0},    {9,0,0,0}, { 3, 5, 0, 0 } }    },
 };