Update mcs/class/System.Core/System/TimeZoneInfo.cs

[mono.git] / mcs / class / IKVM.Reflection / Fusion.cs

diff --git a/mcs/class/IKVM.Reflection/Fusion.cs b/mcs/class/IKVM.Reflection/Fusion.cs
index 7dc7dc5dd6724171897a6925e514031663ce9ba0..d9c0e08611089ea824fb485fa1384608b1686fe0 100644 (file)
--- a/mcs/class/IKVM.Reflection/Fusion.cs
+++ b/mcs/class/IKVM.Reflection/Fusion.cs
@@ -38,6 +38,7 @@ namespace IKVM.Reflection
                internal bool? Retargetable;
                internal ProcessorArchitecture ProcessorArchitecture;
                internal bool HasPublicKey;
+               internal bool WindowsRuntime;
        }
 
        enum ParseAssemblyResult
@@ -308,6 +309,7 @@ namespace IKVM.Reflection
                        {
                                System.Collections.Generic.Dictionary<string, string> unknownAttributes = null;
                                bool hasProcessorArchitecture = false;
+                               bool hasContentType = false;
                                string[] parts = fullName.Substring(pos).Split(',');
                                for (int i = 0; i < parts.Length; i++)
                                {
@@ -406,6 +408,18 @@ namespace IKVM.Reflection
                                                                        return ParseAssemblyResult.GenericError;
                                                        }
                                                        break;
+                                               case "contenttype":
+                                                       if (hasContentType)
+                                                       {
+                                                               return ParseAssemblyResult.DuplicateKey;
+                                                       }
+                                                       hasContentType = true;
+                                                       if (kv[1].Trim().ToLowerInvariant() != "windowsruntime")
+                                                       {
+                                                               return ParseAssemblyResult.GenericError;
+                                                       }
+                                                       parsedName.WindowsRuntime = true;
+                                                       break;
                                                default:
                                                        if (kv[1].Trim() == "")
                                                        {