Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2015-05-05 16:27:36 +0300
committerRodrigo Kumpera <kumpera@gmail.com>2015-05-15 22:55:26 +0300
commit11b58305d0c62dbd81e48c0c8c83aae4c093c70f (patch)
treebe3811ecd2afc6decbc06ccc7bcbf815e1f3248b
parentef50e28e6c98388acf86ff1bb12721f9ef5d9f2d (diff)
[runtime] Add more 3.0 fx assemblies to remapping table. Fixes #29459mono-4.0.1.434.0.1.43
-rw-r--r--mono/metadata/assembly.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index b3855758589..4e97b3ea22c 100644
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -74,6 +74,9 @@ static char **extra_gac_paths = NULL;
* The integer number is an index in the MonoRuntimeInfo structure, whose
* values can be found in domain.c - supported_runtimes. Look there
* to understand what remapping will be made.
+ *
+ * .NET version can be found at https://github.com/dotnet/coreclr/blob/master/src/inc/fxretarget.h#L99
+ *
*/
static const AssemblyVersionMap framework_assemblies [] = {
{"Accessibility", 0},
@@ -102,6 +105,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
{"Npgsql", 0},
{"PEAPI", 0},
{"System", 0},
+ {"System.ComponentModel.Composition", 2},
{"System.ComponentModel.DataAnnotations", 2},
{"System.Configuration", 0},
{"System.Configuration.Install", 0},
@@ -117,6 +121,8 @@ static const AssemblyVersionMap framework_assemblies [] = {
{"System.Drawing", 0},
{"System.Drawing.Design", 0},
{"System.EnterpriseServices", 0},
+ {"System.IdentityModel", 3},
+ {"System.IdentityModel.Selectors", 3},
{"System.Management", 0},
{"System.Messaging", 0},
{"System.Net", 2},
@@ -124,6 +130,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
{"System.Runtime.Serialization", 3},
{"System.Runtime.Serialization.Formatters.Soap", 0},
{"System.Security", 0},
+ {"System.ServiceModel", 3},
{"System.ServiceModel.Web", 2},
{"System.ServiceProcess", 0},
{"System.Transactions", 0},