Also match parameters when identifying property

devlooped · Apr 9, 2021 · 9413924 · 9413924
1 parent 29dc0df
commit 9413924
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Moq/ExpressionExtensions.cs b/src/Moq/ExpressionExtensions.cs
@@ -362,10 +362,15 @@ internal static PropertyInfo GetReboundProperty(this MemberExpression expression
 			// we "upgrade" to the derived property.
 			if (property.DeclaringType != expression.Expression.Type)
 			{
+				var parameterTypes = new ParameterTypes(property.GetIndexParameters());
 				var derivedProperty = expression.Expression.Type
 					.GetMember(property.Name, MemberTypes.Property, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
 					.Cast<PropertyInfo>()
-					.SingleOrDefault(p => p.PropertyType == property.PropertyType);
+					.SingleOrDefault(p =>
+					{
+						return p.PropertyType == property.PropertyType
+							&& new ParameterTypes(p.GetIndexParameters()).CompareTo(parameterTypes, true, false);
+					});
 				if (derivedProperty != null)
 				{
 					if ((derivedProperty.CanRead(out var getter) && getter.GetBaseDefinition() == property.GetGetMethod(true)) ||