Fix AttributesTests on .NET Core and PCL

Author: xplicit

src/ServiceStack.Text/ReflectionExtensions.cs

@@ -118,6 +118,7 @@ public static bool IsInstanceOf(this Type type, Type thisOrBaseType)
 
                 type = type.BaseType();
             }
+
             return false;
         }
 
@@ -1185,7 +1186,6 @@ public static Type AddAttributes(this Type type, params Attribute[] attrs)
             }
 
             typeAttrs.AddRange(attrs);
-
             return type;
         }
 
@@ -1342,17 +1342,24 @@ public static object[] AllAttributes(this FieldInfo fieldInfo, Type attrType)
 
         public static object[] AllAttributes(this Type type)
         {
-#if (NETFX_CORE || PCL || NETSTANDARD)
+#if (NETFX_CORE || PCL)
             return type.GetTypeInfo().GetCustomAttributes(true).ToArray();
+#elif NETSTANDARD
+            return type.GetTypeInfo().GetCustomAttributes(true).Union(type.GetRuntimeAttributes()).ToArray();
 #else
             return type.GetCustomAttributes(true).Union(type.GetRuntimeAttributes()).ToArray();
 #endif
         }
 
         public static object[] AllAttributes(this Type type, Type attrType)
         {
-#if (NETFX_CORE || PCL || NETSTANDARD)
-            return type.GetTypeInfo().GetCustomAttributes(true).Where(x => attrType.IsInstanceOf(x.GetType())).ToArray();
+#if (NETFX_CORE || PCL)
+            return type.GetTypeInfo().GetCustomAttributes(true).Where(x => x.GetType().IsInstanceOf(attrType)).ToArray();
+#elif NETSTANDARD
+            return type.GetTypeInfo().GetCustomAttributes(true)
+                .Where(x => x.GetType().IsInstanceOf(attrType))
+                .Union(type.GetRuntimeAttributes())
+                .ToArray();
 #else
             return type.GetCustomAttributes(true).Union(type.GetRuntimeAttributes()).ToArray();
 #endif
@@ -1408,8 +1415,12 @@ public static TAttr[] AllAttributes<TAttr>(this Type type)
             where TAttr : Attribute
 #endif
         {
-#if (NETFX_CORE || PCL || NETSTANDARD)
+#if (NETFX_CORE || PCL)
             return type.GetTypeInfo().GetCustomAttributes<TAttr>(true).ToArray();
+#elif NETSTANDARD
+            return type.GetTypeInfo().GetCustomAttributes<TAttr>(true)
+                .Union(type.GetRuntimeAttributes<TAttr>())
+                .ToArray();
 #else
             return type.GetCustomAttributes(typeof(TAttr), true)
                 .OfType<TAttr>()

tests/ServiceStack.Text.Tests/AttributeTests.cs

@@ -37,9 +37,10 @@ public void Does_get_Multiple_RouteDefault_Attributes()
         {
             // AllAttributes<T>() makes this call to get attrs
 #if NETCORE
-            var referenceGeneric = typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
-			.Where(x => typeof(RouteDefaultAttribute).IsInstanceOf(x.GetType())).ToArray()
-			.OfType<RouteDefaultAttribute>();
+            var referenceGeneric =
+                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
+                    .Where(x => x.GetType().IsInstanceOf(typeof(RouteDefaultAttribute)))
+                    .OfType<RouteDefaultAttribute>();
 #else
             var referenceGeneric =
                 typeof(DefaultWithMultipleAttributes).GetCustomAttributes(typeof(RouteDefaultAttribute), true)
@@ -50,8 +51,9 @@ public void Does_get_Multiple_RouteDefault_Attributes()
 
             // AllAttributes() makes this call to get attrs
 #if NETCORE
-            var reference = typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
-			.Where(x => typeof(RouteDefaultAttribute).IsInstanceOf(x.GetType())).ToArray();
+            var reference =
+                typeof(DefaultWithMultipleAttributes).GetTypeInfo().GetCustomAttributes(true)
+			        .Where(x => x.GetType().IsInstanceOf(typeof(RouteDefaultAttribute))).ToArray();
 #else
             var reference =
                 typeof(DefaultWithMultipleAttributes).GetCustomAttributes(typeof(RouteDefaultAttribute), true);