Add workaround for netstandard1.3

aaubry · Apr 19, 2020 · 4ba7eb6 · 4ba7eb6
1 parent ac7664b
commit 4ba7eb6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/YamlDotNet/Helpers/Portability.cs b/YamlDotNet/Helpers/Portability.cs
@@ -249,6 +249,25 @@ public static bool IsInstanceOf(this Type type, object o)
         {
             return o.GetType() == type || o.GetType().GetTypeInfo().IsSubclassOf(type);
         }
+
+        public static Attribute[] GetAllCustomAttributes<TAttribute>(this PropertyInfo member)
+        {
+            // IMemberInfo.GetCustomAttributes ignores it's "inherit" parameter for properties,
+            // and the suggested replacement (Attribute.GetCustomAttributes) is not available
+            // on netstandard1.3
+            var result = new List<Attribute>();
+            var type = member.DeclaringType;
+
+            while (type != null)
+            {
+                type.GetPublicProperty(member.Name);
+                result.AddRange(member.GetCustomAttributes(typeof(TAttribute)));
+
+                type = type.BaseType();
+            }
+
+            return result.ToArray();
+        }
     }
 
     internal sealed class CultureInfoAdapter : CultureInfo
@@ -374,6 +393,12 @@ public static bool IsInstanceOf(this Type type, object o)
         {
             return type.IsInstanceOfType(o);
         }
+
+        public static Attribute[] GetAllCustomAttributes<TAttribute>(this PropertyInfo property)
+        {
+            // Don't use IMemberInfo.GetCustomAttributes, it ignores the inherit parameter
+            return Attribute.GetCustomAttributes(property, typeof(TAttribute));
+        }
     }
 
     internal sealed class CultureInfoAdapter : CultureInfo

diff --git a/YamlDotNet/Serialization/TypeInspectors/ReadablePropertiesTypeInspector.cs b/YamlDotNet/Serialization/TypeInspectors/ReadablePropertiesTypeInspector.cs
@@ -79,8 +79,7 @@ public void Write(object target, object? value)
 
             public T GetCustomAttribute<T>() where T : Attribute
             {
-                // Don't use IMemberInfo.GetCustomAttributes, it ignores the inherit parameter
-                var attributes = Attribute.GetCustomAttributes(propertyInfo, typeof(T));
+                var attributes = propertyInfo.GetAllCustomAttributes<T>();
                 return (T)attributes.FirstOrDefault();
             }