Merge pull request #653 from Endures/Fix-Get-Custom-Attributes

修复使用扩展方法不能获取到指定的Attibute的问题
Ourpalm · Feb 10, 2022 · 3ee7017 · 3ee7017
2 parents c490b06 + bd52e1b
commit 3ee7017
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 7 deletions.
diff --git a/ILRuntime/Reflection/ILRuntimeFieldInfo.cs b/ILRuntime/Reflection/ILRuntimeFieldInfo.cs
@@ -154,7 +154,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
             if (customAttributes == null)
                 InitializeCustomAttribute();
 
-            List<object> res = new List<object>();
+            List<Attribute> res = new List<Attribute>();
             for (int i = 0; i < customAttributes.Length; i++)
             {
                 if (attributeTypes[i].Equals(attributeType) || attributeTypes[i].IsSubclassOf(attributeType))

diff --git a/ILRuntime/Reflection/ILRuntimeMethodInfo.cs b/ILRuntime/Reflection/ILRuntimeMethodInfo.cs
@@ -132,7 +132,7 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
         {
             if (customAttributes == null)
                 InitializeCustomAttribute();
-            List<object> res = new List<object>();
+            List<Attribute> res = new List<Attribute>();
             for (int i = 0; i < customAttributes.Length; i++)
             {
                 if (attributeTypes[i].Equals(attributeType))

diff --git a/ILRuntime/Reflection/ILRuntimeType.cs b/ILRuntime/Reflection/ILRuntimeType.cs
@@ -219,9 +219,9 @@ public override object[] GetCustomAttributes(bool inherit)
                 InitializeCustomAttribute();
             if (inherit && BaseType != null)
             {
-                List<object> result = new List<object>();
+                List<Attribute> result = new List<Attribute>();
                 result.AddRange(customAttributes);
-                result.AddRange(BaseType.GetCustomAttributes(inherit));
+                result.AddRange(BaseType.GetCustomAttributes(inherit) as Attribute[]);
                 return result.ToArray();
             }
             return customAttributes;
@@ -231,15 +231,15 @@ public override object[] GetCustomAttributes(Type attributeType, bool inherit)
         {
             if (customAttributes == null)
                 InitializeCustomAttribute();
-            List<object> res = new List<object>();
+            List<Attribute> res = new List<Attribute>();
             for (int i = 0; i < customAttributes.Length; i++)
             {
                 if (attributeTypes[i].Equals((object)attributeType))
                     res.Add(customAttributes[i]);
             }
             if (inherit && BaseType != null)
             {
-                res.AddRange(BaseType.GetCustomAttributes(attributeType, inherit));
+                res.AddRange(BaseType.GetCustomAttributes(attributeType, inherit) as Attribute[]);
             }
             return res.ToArray();
         }

diff --git a/TestCases/TestLL.cs b/TestCases/TestLL.cs
@@ -22,11 +22,15 @@ class XmlFieldMapAttribute : XmlAttribute
 
     }
 
-
+    [XmlFieldMapAttribute]
     public class TestLL
     {
         [XmlFieldMapAttribute]
         public Dictionary<int, int> tempMap = new Dictionary<int, int>();
+        [XmlFieldMapAttribute]
+        public Dictionary<int, int> tempMapProperty => tempMap;
+        [XmlFieldMapAttribute]
+        public Dictionary<int, int> GetTempMap() => tempMap;
 
         public static string TestIsAssignableFrom()
         {
@@ -59,5 +63,44 @@ public static string TestILRuntimeTypeEquals()
 
             return "Test finish!";
         }
+
+        public static void TestFieldGetCustomAttribte()
+        {
+            FieldInfo fieldInfo = typeof(TestLL).GetField("tempMap");
+
+            Console.WriteLine($"test GetCustomAttribute using System.Reflection.CustomAttributeExtensions.GetCustomAttribute");
+            var attribute = fieldInfo.GetCustomAttribute(typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL.tempMap has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+
+            Console.WriteLine($"test GetCustomAttribute using System.Attribute.GetCustomAttribute");
+            attribute = Attribute.GetCustomAttribute(fieldInfo, typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL.tempMap has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+        }
+
+        public static void TestTypeGetCustomAttribte()
+        {
+            var type = typeof(TestLL);
+
+            Console.WriteLine($"test GetCustomAttribute using System.Reflection.CustomAttributeExtensions.GetCustomAttribute");
+            var attribute = type.GetCustomAttribute(typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+
+            Console.WriteLine($"test GetCustomAttribute using System.Attribute.GetCustomAttribute");
+            attribute = Attribute.GetCustomAttribute(type, typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+        }
+
+        public static void TestMethodGetCustomAttribte()
+        {
+            var methodInfo = typeof(TestLL).GetMethod("GetTempMap");
+
+            Console.WriteLine($"test GetCustomAttribute using System.Reflection.CustomAttributeExtensions.GetCustomAttribute");
+            var attribute = methodInfo.GetCustomAttribute(typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL.GetTempMap has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+
+            Console.WriteLine($"test GetCustomAttribute using System.Attribute.GetCustomAttribute");
+            attribute = Attribute.GetCustomAttribute(methodInfo, typeof(XmlFieldMapAttribute), true);
+            Console.WriteLine($"TestLL.GetTempMap has {(attribute == null ? "NO " : "")}XmlFieldMapAttribute");
+        }
     }
 }