X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FIKVM.Reflection%2FFusion.cs;h=d9c0e08611089ea824fb485fa1384608b1686fe0;hb=10eadfdd38d35fbc2906008375984770dcc478bc;hp=7dc7dc5dd6724171897a6925e514031663ce9ba0;hpb=bf1d286b72d9ffb15f926d40fd9e0b6b5fcf1c39;p=mono.git

diff --git a/mcs/class/IKVM.Reflection/Fusion.cs b/mcs/class/IKVM.Reflection/Fusion.cs
index 7dc7dc5dd67..d9c0e086110 100644
--- 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() == "")
 							{