Verify[All] should mark invocations of conditional setups

While this is a step away from being able to expose a generic
`Verify(setupPredicate)` method, we need to do this for back-compat.

A future `Verify(setupPredicate)` method will simply have to have
slightly different behavior where the same predicate applies on both
the setup & invocation sides.

(This commit also removes a superfluous double predicate check.)

CHANGELOG.md

@@ -15,6 +15,9 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 
 * Performance regression: Adding setups to a mock becomes slower with each setup (@CeesKaas, #1110)
 
+* Regression: `mock.Verify[All]` no longer marks invocations as verified if they were matched by conditional setups. (@Lyra2108, #1114)
+
+
 ## 4.15.2 (2020-11-26)
 
 #### Changed

src/Moq/Mock.cs

@@ -258,7 +258,7 @@ public DefaultValue DefaultValue
 		/// </example>
 		public void Verify()
 		{
-			this.Verify(setup => !setup.IsOverridden && !setup.IsConditional && setup.IsVerifiable);
+			this.Verify(setup => setup.IsVerifiable);
 		}
 
 		/// <summary>
@@ -283,7 +283,7 @@ public void Verify()
 		/// </example>
 		public void VerifyAll()
 		{
-			this.Verify(setup => !setup.IsOverridden && !setup.IsConditional);
+			this.Verify(setup => true);
 		}
 
 		private void Verify(Func<ISetup, bool> predicate)
@@ -313,9 +313,9 @@ internal bool TryVerify(Func<ISetup, bool> predicate, HashSet<Mock> verifiedMock
 
 			var errors = new List<MockException>();
 
-			foreach (var setup in this.MutableSetups.ToArray(predicate))
+			foreach (var setup in this.MutableSetups.ToArray(setup => !setup.IsOverridden && !setup.IsConditional && predicate(setup)))
 			{
-				if (predicate(setup) && !setup.TryVerify(recursive: true, predicate, verifiedMocks, out var e) && e.IsVerificationError)
+				if (!setup.TryVerify(recursive: true, predicate, verifiedMocks, out var e) && e.IsVerificationError)
 				{
 					errors.Add(e);
 				}

src/Moq/Setup.cs

@@ -173,12 +173,12 @@ protected virtual void ResetCore()
 
 		public void Verify(bool recursive = true)
 		{
-			this.Verify(recursive, setup => !setup.IsOverridden && !setup.IsConditional && setup.IsVerifiable);
+			this.Verify(recursive, setup => setup.IsVerifiable);
 		}
 
 		public void VerifyAll()
 		{
-			this.Verify(recursive: true, setup => !setup.IsOverridden && !setup.IsConditional);
+			this.Verify(recursive: true, setup => true);
 		}
 
 		private void Verify(bool recursive, Func<ISetup, bool> predicate)