Fix merge

dotnet · Apr 2, 2021 · cfaf1e5 · cfaf1e5
2 parents b619ccf + e07ae0d
commit cfaf1e5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/EFCore/Internal/ManyToManyLoader.cs b/src/EFCore/Internal/ManyToManyLoader.cs
@@ -5,12 +5,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
-using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.ChangeTracking.Internal;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
 
 namespace Microsoft.EntityFrameworkCore.Internal
@@ -174,7 +174,7 @@ private static Expression<Func<TEntity, IEnumerable<TSourceEntity>>> BuildInclud
                     EnumerableMethods.Where.MakeGenericMethod(typeof(TSourceEntity)),
                     Expression.MakeMemberAccess(
                         entityParameter,
-                        (skipNavigation.PropertyInfo ?? (MemberInfo)skipNavigation.FieldInfo!)),
+                        (skipNavigation.GetIdentifyingMemberInfo()!)),
                     Expression.Lambda<Func<TSourceEntity, bool>>(
                         ExpressionExtensions.BuildPredicate(keyProperties, keyValues, whereParameter),
                         whereParameter)), entityParameter);
@@ -197,7 +197,7 @@ private static Expression<Func<TSourceEntity, IEnumerable<TEntity>>> BuildSelect
             return Expression.Lambda<Func<TSourceEntity, IEnumerable<TEntity>>>(
                 Expression.MakeMemberAccess(
                     entityParameter,
-                    (navigation.PropertyInfo ?? (MemberInfo)navigation.FieldInfo!)),
+                    (navigation.GetIdentifyingMemberInfo()!)),
                 entityParameter);
         }
     }