merge initial legacy support into master

src/Moq/Moq.Tests/VerificationTests.cs

@@ -222,8 +222,6 @@ public void VerifyExtensionAction()
             Assert.Throws<VerifyException>(() => calculator.Verify(x => x.TurnOn(), "Should have been called!"));
             // Once with message
             Assert.Throws<VerifyException>(() => calculator.Verify(x => x.TurnOn(), 1, "Should have been called!"));
-            // Times.Once with message
-            Assert.Throws<VerifyException>(() => calculator.Verify(x => x.TurnOn(), Times.Once, "Should have been called!"));
 
             calculator.TurnOn();
 
@@ -235,8 +233,6 @@ public void VerifyExtensionAction()
             calculator.Verify(x => x.TurnOn(), "Should have been called!");
             // Once with message
             calculator.Verify(x => x.TurnOn(), 1, "Should have been called!");
-            // Times.Once with message
-            calculator.Verify(x => x.TurnOn(), Times.Once, "Should have been called!");
         }
 
         [Fact]
@@ -253,7 +249,7 @@ public void VerifyExtensionFunction()
             // Once with message
             Assert.Throws<VerifyException>(() => calculator.Verify(x => x.Add(2, 3), 1, "Should have been called!"));
             // Times.Once with message
-            Assert.Throws<VerifyException>(() => calculator.Verify(x => x.Add(2, 3), Times.Once, "Should have been called!"));
+            Assert.Throws<VerifyException>(() => calculator.Verify(x => x.Add(2, 3).Once(), "Should have been called!"));
 
             calculator.Add(2, 3);
 
@@ -266,7 +262,7 @@ public void VerifyExtensionFunction()
             // Once with message
             calculator.Verify(x => x.Add(2, 3), 1, "Should have been called!");
             // Times.Once with message
-            calculator.Verify(x => x.Add(2, 3), Times.Once, "Should have been called!");
+            calculator.Verify(x => x.Add(2, 3).Once(), "Should have been called!");
         }
 
         //[Fact]

src/Moq/Moq/Legacy/It.cs

@@ -0,0 +1,16 @@
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+using System.ComponentModel;
+using static Moq.Syntax;
+
+namespace Moq
+{
+    /// <summary>Supports the legacy API.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static class It
+    {
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static T IsAny<T>() => Any<T>();
+    }
+}
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member

src/Moq/Moq/Legacy/MockSetup`1.cs

@@ -0,0 +1,178 @@
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
+using System;
+using System.ComponentModel;
+using Moq.Sdk;
+
+namespace Moq
+{
+    /// <summary>Supports the legacy API.</summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class MockSetup<TTarget>
+    {
+        readonly TTarget target;
+        readonly IMock<TTarget> mock;
+        readonly Action<TTarget> action;
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup(TTarget target, IMock<TTarget> mock, Action<TTarget> action)
+        {
+            this.target = target;
+            this.mock = mock;
+            this.action = action;
+        }
+
+        #region Callback
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8, T9>(Action<T1, T2, T3, T4, T5, T6, T7, T8, T9> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7, T8>(Action<T1, T2, T3, T4, T5, T6, T7, T8> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6, T7>(Action<T1, T2, T3, T4, T5, T6, T7> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5, T6>(Action<T1, T2, T3, T4, T5, T6> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4, T5>(Action<T1, T2, T3, T4, T5> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3, T4>(Action<T1, T2, T3, T4> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2, T3>(Action<T1, T2, T3> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T1, T2>(Action<T1, T2> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback<T>(Action<T> action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Callback(Action action)
+        {
+            target.Setup(action).Callback(action);
+            return this;
+        }
+
+        #endregion
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void Verifiable() => target.Setup(action).Verifiable();
+
+        /// <summary>Supports the legacy API.</summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public MockSetup<TTarget> Throws(Exception exception)
+        {
+            target.Setup(action).Throws(exception);
+            return this;
+        }
+    }
+}
+#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member