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

[mono.git] / mcs / class / IKVM.Reflection / Reader / AssemblyReader.cs

diff --git a/mcs/class/IKVM.Reflection/Reader/AssemblyReader.cs b/mcs/class/IKVM.Reflection/Reader/AssemblyReader.cs
index 845bff3817b873ded19f8f48676eb09b788394c4..0004862ee09960b9ee373802c97ef8d7b2a1c465 100644 (file)
--- a/mcs/class/IKVM.Reflection/Reader/AssemblyReader.cs
+++ b/mcs/class/IKVM.Reflection/Reader/AssemblyReader.cs
@@ -49,11 +49,6 @@ namespace IKVM.Reflection.Reader
                        get { return location; }
                }
 
-               public override string FullName
-               {
-                       get { return GetName().FullName; }
-               }
-
                public override AssemblyName GetName()
                {
                        return GetNameImpl(ref manifestModule.AssemblyTable.records[0]);
@@ -114,9 +109,22 @@ namespace IKVM.Reflection.Reader
                        return type;
                }
 
+               internal override Type FindTypeIgnoreCase(TypeName lowerCaseName)
+               {
+                       Type type = manifestModule.FindTypeIgnoreCase(lowerCaseName);
+                       for (int i = 0; type == null && i < externalModules.Length; i++)
+                       {
+                               if ((manifestModule.File.records[i].Flags & ContainsNoMetaData) == 0)
+                               {
+                                       type = GetModule(i).FindTypeIgnoreCase(lowerCaseName);
+                               }
+                       }
+                       return type;
+               }
+
                public override string ImageRuntimeVersion
                {
-                       get { return manifestModule.ImageRuntimeVersion; }
+                       get { return manifestModule.__ImageRuntimeVersion; }
                }
 
                public override Module ManifestModule
@@ -256,9 +264,14 @@ namespace IKVM.Reflection.Reader
                        get { return (AssemblyNameFlags)manifestModule.AssemblyTable.records[0].Flags; }
                }
 
+               internal string Name
+               {
+                       get { return manifestModule.GetString(manifestModule.AssemblyTable.records[0].Name); }
+               }
+
                internal override IList<CustomAttributeData> GetCustomAttributesData(Type attributeType)
                {
-                       return manifestModule.GetCustomAttributes(0x20000001, attributeType);
+                       return CustomAttributeData.GetCustomAttributesImpl(null, manifestModule, 0x20000001, attributeType) ?? CustomAttributeData.EmptyList;
                }
        }
 }