Merge pull request #31756 from dotnet-maestro-bot/merge/release/8.0-t…

…o-main

[automated] Merge branch 'release/8.0' => 'main'

src/EFCore/EF.cs

@@ -41,7 +41,7 @@ internal static MethodInfo MakePropertyMethod(Type type)
     public static bool IsDesignTime { get; set; }
 
     /// <summary>
-    ///     References a given property or navigation on an entity instance. This is useful for shadow state properties, for
+    ///     References a given property or navigation on an entity or complex type instance. This is useful for shadow state properties, for
     ///     which no CLR property exists. Currently this method can only be used in LINQ queries and can not be used to
     ///     access the value assigned to a property in other scenarios.
     /// </summary>
@@ -54,11 +54,11 @@ internal static MethodInfo MakePropertyMethod(Type type)
     ///     </para>
     /// </remarks>
     /// <typeparam name="TProperty">The type of the property being referenced.</typeparam>
-    /// <param name="entity">The entity to access the property on.</param>
+    /// <param name="instance">The entity or complex type to access the property on.</param>
     /// <param name="propertyName">The name of the property.</param>
     /// <returns>The value assigned to the property.</returns>
     public static TProperty Property<TProperty>(
-        object entity,
+        object instance,
         [NotParameterized] string propertyName)
         => throw new InvalidOperationException(CoreStrings.PropertyMethodInvoked);
 

src/EFCore/Infrastructure/ExpressionExtensions.cs

@@ -384,6 +384,13 @@ private static Expression CreateEFPropertyExpression(
             propertyType = propertyType.MakeNullable();
         }
 
+        // EF.Property expects an object as its first argument. If the target is a struct (complex type), we need an explicit up-cast to
+        // object.
+        if (target.Type.IsValueType)
+        {
+            target = Expression.Convert(target, typeof(object));
+        }
+
         return Expression.Call(
             EF.MakePropertyMethod(propertyType),
             target,