summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorJo Shields <directhex@apebox.org>2013-10-17 13:55:48 +0100
committerJo Shields <directhex@apebox.org>2013-10-17 13:55:48 +0100
commitd0a215f5626219ff7927f576588a777e5331c7be (patch)
tree000e730e32af8a6528a38a4164fef173d4b7fa2a /external
parent621d62beabd2b7a9cf0a7d77b961695f9ebfaac5 (diff)
downloadmono-d0a215f5626219ff7927f576588a777e5331c7be.tar.gz
Imported Upstream version 3.2.3+dfsgupstream/3.2.3+dfsg
Diffstat (limited to 'external')
-rw-r--r--external/ikvm/reflect/Fusion.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/external/ikvm/reflect/Fusion.cs b/external/ikvm/reflect/Fusion.cs
index 5627ce29f5..dafb60e4ff 100644
--- a/external/ikvm/reflect/Fusion.cs
+++ b/external/ikvm/reflect/Fusion.cs
@@ -194,7 +194,7 @@ namespace IKVM.Reflection
{ "System.ComponentModel.DataAnnotations", "ddd0da4d3e678217", WINFX_KEY },
{ "System.Core", SILVERLIGHT_KEY, ECMA_KEY },
// FIXME: MS uses MSFINAL_KEY for .NET 4.5
- { "System.Net", SILVERLIGHT_KEY, ECMA_KEY },
+ { "System.Net", SILVERLIGHT_KEY, MSFINAL_KEY },
{ "System.Numerics", WINFX_KEY, MSFINAL_KEY },
{ "System.Runtime.Serialization", SILVERLIGHT_KEY, ECMA_KEY },
{ "System.ServiceModel", WINFX_KEY, ECMA_KEY },
@@ -202,7 +202,7 @@ namespace IKVM.Reflection
{ "System.Windows", SILVERLIGHT_KEY, MSFINAL_KEY },
{ "System.Xml", SILVERLIGHT_KEY, ECMA_KEY },
{ "System.Xml.Linq", WINFX_KEY, ECMA_KEY },
- { "System.Xml.Serialization", WINFX_KEY, MSFINAL_KEY }
+ { "System.Xml.Serialization", WINFX_KEY, ECMA_KEY }
};
static bool HasPclRuntimeRemapping(ParsedAssemblyName name1, ParsedAssemblyName name2)