[automated] Merge branch 'release/2.2' => 'master'

shared/Microsoft.Extensions.PropertyHelper.Sources/PropertyHelper.cs

@@ -7,6 +7,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 
 namespace Microsoft.Extensions.Internal
 {
@@ -37,6 +38,12 @@ internal class PropertyHelper
         private static readonly ConcurrentDictionary<Type, PropertyHelper[]> VisiblePropertiesCache =
             new ConcurrentDictionary<Type, PropertyHelper[]>();
 
+        // We need to be able to check if a type is a 'ref struct' - but we need to be able to compile
+        // for platforms where the attribute is not defined, like net46. So we can fetch the attribute
+        // by late binding. If the attribute isn't defined, then we assume we won't encounter any
+        // 'ref struct' types.
+        private static readonly Type IsByRefLikeAttribute = Type.GetType("System.Runtime.CompilerServices.IsByRefLikeAttribute", throwOnError: false);
+
         private Action<object, object> _valueSetter;
         private Func<object, object> _valueGetter;
 
@@ -511,16 +518,34 @@ protected static PropertyHelper[] GetProperties(
             return helpers;
         }
 
-        // Indexed properties are not useful (or valid) for grabbing properties off an object.
+
         private static bool IsInterestingProperty(PropertyInfo property)
         {
             // For improving application startup time, do not use GetIndexParameters() api early in this check as it
             // creates a copy of parameter array and also we would like to check for the presence of a get method
             // and short circuit asap.
-            return property.GetMethod != null &&
+            return 
+                property.GetMethod != null &&
                 property.GetMethod.IsPublic &&
                 !property.GetMethod.IsStatic &&
+
+                // PropertyHelper can't work with ref structs.
+                !IsRefStructProperty(property) &&
+
+                // Indexed properties are not useful (or valid) for grabbing properties off an object.
                 property.GetMethod.GetParameters().Length == 0;
         }
+
+        // PropertyHelper can't really interact with ref-struct properties since they can't be 
+        // boxed and can't be used as generic types. We just ignore them.
+        //
+        // see: https://github.com/aspnet/Mvc/issues/8545
+        private static bool IsRefStructProperty(PropertyInfo property)
+        {
+            return
+                IsByRefLikeAttribute != null &&
+                property.PropertyType.IsValueType &&
+                property.PropertyType.IsDefined(IsByRefLikeAttribute);
+        }
     }
 }

test/Microsoft.Extensions.Internal.Test/PropertyHelperTest.cs

@@ -153,6 +153,22 @@ public void PropertyHelper_DoesNotFindStaticProperties()
             Assert.Equal("Prop5", helper.Name);
         }
 
+#if NETSTANDARD || NETCOREAPP
+        [Fact]
+        public void PropertyHelper_RefStructProperties()
+        {
+            // Arrange
+            var obj = new RefStructProperties();
+
+            // Act + Assert
+            var helper = Assert.Single(PropertyHelper.GetProperties(obj.GetType().GetTypeInfo()));
+            Assert.Equal("Prop5", helper.Name);
+        }
+#elif NET46 || NET461
+#else
+#error Unknown TFM - update the set of TFMs where we test for ref structs
+#endif
+
         [Fact]
         public void PropertyHelper_DoesNotFindSetOnlyProperties()
         {
@@ -718,6 +734,22 @@ private class Static
             public int Prop5 { get; set; }
         }
 
+#if NETSTANDARD || NETCOREAPP
+        private class RefStructProperties
+        {
+            public Span<bool> Span => throw new NotImplementedException();
+            public MyRefStruct UserDefined => throw new NotImplementedException();
+
+            public int Prop5 { get; set; }
+        }
+
+        private readonly ref struct MyRefStruct
+        {
+        }
+#elif NET46 || NET461
+#else
+#error Unknown TFM - update the set of TFMs where we test for ref structs
+#endif
         private struct MyProperties
         {
             public int IntProp { get; set; }