Fix for value types and tuples

Author: javiercn

src/Components/Components/src/Reflection/PropertyGetter.cs

@@ -11,9 +11,6 @@ internal sealed class PropertyGetter
 {
     private static readonly MethodInfo CallPropertyGetterOpenGenericMethod =
         typeof(PropertyGetter).GetMethod(nameof(CallPropertyGetter), BindingFlags.NonPublic | BindingFlags.Static)!;
-    
-    private static readonly MethodInfo CallPropertyGetterByReferenceOpenGenericMethod =
-        typeof(PropertyGetter).GetMethod(nameof(CallPropertyGetterByReference), BindingFlags.NonPublic | BindingFlags.Static)!;
 
     // Delegate type for a by-ref property getter
     private delegate TValue ByRefFunc<TDeclaringType, TValue>(ref TDeclaringType arg);
@@ -37,31 +34,14 @@ public PropertyGetter(Type targetType, PropertyInfo property)
         {
             var getMethod = property.GetMethod;
 
-            // Instance methods in the CLR can be turned into static methods where the first parameter
-            // is open over "target". This parameter is always passed by reference, so we have a code
-            // path for value types and a code path for reference types.
-            if (getMethod.DeclaringType!.IsValueType)
-            {
-                // Create a delegate (ref TDeclaringType) -> TValue
-                var delegateType = typeof(ByRefFunc<,>).MakeGenericType(targetType, property.PropertyType);
-                var propertyGetterDelegate = getMethod.CreateDelegate(delegateType);
-                var wrapperDelegateMethod = CallPropertyGetterByReferenceOpenGenericMethod.MakeGenericMethod(targetType, property.PropertyType);
-                var accessorDelegate = wrapperDelegateMethod.CreateDelegate(
-                    typeof(Func<object, object?>),
-                    propertyGetterDelegate);
-                _GetterDelegate = (Func<object, object?>)accessorDelegate;
-            }
-            else
-            {
-                // Create a delegate TDeclaringType -> TValue
-                var delegateType = typeof(Func<,>).MakeGenericType(targetType, property.PropertyType);
-                var propertyGetterDelegate = getMethod.CreateDelegate(delegateType);
-                var wrapperDelegateMethod = CallPropertyGetterOpenGenericMethod.MakeGenericMethod(targetType, property.PropertyType);
-                var accessorDelegate = wrapperDelegateMethod.CreateDelegate(
-                    typeof(Func<object, object?>),
-                    propertyGetterDelegate);
-                _GetterDelegate = (Func<object, object?>)accessorDelegate;
-            }
+            var propertyGetterAsFunc =
+                getMethod.CreateDelegate(typeof(Func<,>).MakeGenericType(targetType, property.PropertyType));
+
+            var callPropertyGetterClosedGenericMethod =
+                CallPropertyGetterOpenGenericMethod.MakeGenericMethod(targetType, property.PropertyType);
+
+            _GetterDelegate = (Func<object, object>)
+                callPropertyGetterClosedGenericMethod.CreateDelegate(typeof(Func<object, object>), propertyGetterAsFunc);
         }
         else
         {
@@ -78,13 +58,4 @@ public PropertyGetter(Type targetType, PropertyInfo property)
     {
         return Getter((TTarget)target);
     }
-
-    private static object? CallPropertyGetterByReference<TTarget, TValue>(
-        ByRefFunc<TTarget, TValue> Getter,
-        object target)
-        where TTarget : notnull
-    {
-        var unboxed = (TTarget)target;
-        return Getter(ref unboxed);
-    }
 }

src/Components/Shared/src/JsonSerializerOptionsProvider.cs

@@ -11,5 +11,6 @@ internal static class JsonSerializerOptionsProvider
     {
         PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
         PropertyNameCaseInsensitive = true,
+        IncludeFields = true,
     };
 }