AmbiguousMatchException when setting up the property, that hides another one

src/Moq/ExpressionExtensions.cs

@@ -320,7 +320,9 @@ internal static PropertyInfo GetReboundProperty(this MemberExpression expression
 			// we "upgrade" to the derived property.
 			if (property.DeclaringType != expression.Expression.Type)
 			{
-				var derivedProperty = expression.Expression.Type.GetProperty(property.Name, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
+				var derivedProperty = expression.Expression.Type
+					.GetProperties(BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance)
+					.SingleOrDefault(p => p.Name == property.Name && p.PropertyType == property.PropertyType);
 				if (derivedProperty != null && derivedProperty.GetMethod.GetBaseDefinition() == property.GetMethod)
 				{
 					return derivedProperty;

tests/Moq.Tests/HidePropertyFixture.cs

@@ -0,0 +1,35 @@
+// Copyright (c) 2007, Clarius Consulting, Manas Technology Solutions, InSTEDD.
+// All rights reserved. Licensed under the BSD 3-Clause License; see License.txt.
+
+using Xunit;
+
+namespace Moq.Tests
+{
+	public class HidePropertyFixture
+	{
+		public class A
+		{
+			public string Prop { get; }
+		}
+
+		public class B : A
+		{
+			public new virtual int Prop { get; }
+		}
+
+		public class C : B
+		{
+		}
+
+		[Fact]
+		public void SetupsDerivedProperty()
+		{
+			var mock = new Mock<C>();
+			var value = 5;
+
+			mock.Setup(m => m.Prop).Returns(value);
+
+			Assert.Equal(value, mock.Object.Prop);
+		}
+	}
+}