[loader] Add a few Framework Facades assemblies (#4784)
authorAleksey Kliger (λgeek) <akliger@gmail.com>
Tue, 2 May 2017 23:01:28 +0000 (19:01 -0400)
committerAlexander Köplinger <alex.koeplinger@outlook.com>
Tue, 2 May 2017 23:01:28 +0000 (01:01 +0200)
that were previously missing, or mislabeled as ordinary framework assemblies.

mono/metadata/assembly.c

index afcd5990b52a9c43c86541d7ec523f9cf4291f95..5bc9486f897e85703bbf689875c78867e671f786 100644 (file)
@@ -123,6 +123,9 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"Microsoft.Build.Utilities.v3.5", 2, "Microsoft.Build.Utilities.v4.0"},
        {"Microsoft.VisualBasic", 1},
        {"Microsoft.VisualC", 1},
+       FACADE_ASSEMBLY ("Microsoft.Win32.Primitives"),
+       FACADE_ASSEMBLY ("Microsoft.Win32.Registry"),
+       FACADE_ASSEMBLY ("Microsoft.Win32.Registry.AccessControl"),
        {"Mono.Cairo", 0},
        {"Mono.CompilerServices.SymbolWriter", 0},
        {"Mono.Data", 0},
@@ -209,7 +212,6 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"System.Net.Http", 4},
        {"System.Net.Http.Rtc", 0},
        FACADE_ASSEMBLY ("System.Net.HttpListener"),
-       {"System.Net.NetworkInformation", 0},
        FACADE_ASSEMBLY ("System.Net.Mail"),
        FACADE_ASSEMBLY ("System.Net.NameResolution"),
        FACADE_ASSEMBLY ("System.Net.NetworkInformation"),
@@ -226,6 +228,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
        {"System.Numerics.Vectors", 3},
        FACADE_ASSEMBLY ("System.ObjectModel"),
        FACADE_ASSEMBLY ("System.Reflection"),
+       FACADE_ASSEMBLY ("System.Reflection.DispatchProxy"),
        FACADE_ASSEMBLY ("System.Reflection.Emit"),
        FACADE_ASSEMBLY ("System.Reflection.Emit.ILGeneration"),
        FACADE_ASSEMBLY ("System.Reflection.Emit.Lightweight"),
@@ -245,7 +248,7 @@ static const AssemblyVersionMap framework_assemblies [] = {
        FACADE_ASSEMBLY ("System.Runtime.Numerics"),
        {"System.Runtime.Remoting", 0},
        {"System.Runtime.Serialization", 3},
-       {"System.Runtime.Serialization.Formatters", 3},
+       FACADE_ASSEMBLY ("System.Runtime.Serialization.Formatters"),
        {"System.Runtime.Serialization.Formatters.Soap", 0},
        FACADE_ASSEMBLY ("System.Runtime.Serialization.Json"),
        FACADE_ASSEMBLY ("System.Runtime.Serialization.Primitives"),
@@ -275,11 +278,11 @@ static const AssemblyVersionMap framework_assemblies [] = {
        FACADE_ASSEMBLY ("System.Security.Principal.Windows"),
        FACADE_ASSEMBLY ("System.Security.SecureString"),
        {"System.ServiceModel", 3},
-       {"System.ServiceModel.Duplex", 3},
-       {"System.ServiceModel.Http", 3},
-       {"System.ServiceModel.NetTcp", 3},
-       {"System.ServiceModel.Primitives", 3},
-       {"System.ServiceModel.Security", 3},
+       FACADE_ASSEMBLY ("System.ServiceModel.Duplex"),
+       FACADE_ASSEMBLY ("System.ServiceModel.Http"),
+       FACADE_ASSEMBLY ("System.ServiceModel.NetTcp"),
+       FACADE_ASSEMBLY ("System.ServiceModel.Primitives"),
+       FACADE_ASSEMBLY ("System.ServiceModel.Security"),
        {"System.ServiceModel.Web", 2},
        {"System.ServiceProcess", 0},
        FACADE_ASSEMBLY ("System.ServiceProcess.ServiceController"),