Remove spurious unmerged change comment from dotnet format

Fixes #1451

src/Moq.Tests/ActionObserverFixture.cs

@@ -249,27 +249,13 @@ public void It_IsAny_short_widened_to_int_parameter()
                 AssertReconstructable(
                     x => x.VoidWithInt(It.IsAny<short>()),
                     x => x.VoidWithInt(It.IsAny<short>()));
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private void AssertReconstructable(string expected, Action<IX> action)
-                After:
-                            void AssertReconstructable(string expected, Action<IX> action)
-                */
             }
 
             void AssertReconstructable(string expected, Action<IX> action)
             {
                 Expression actual = ActionObserver.Instance.ReconstructExpression(action);
                 actual = PrepareForComparison.Instance.Visit(actual);
                 Assert.Equal(expected, actual.ToStringFixed());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private void AssertReconstructable(Expression<Action<IX>> expected, Action<IX> action)
-                After:
-                            void AssertReconstructable(Expression<Action<IX>> expected, Action<IX> action)
-                */
             }
 
             void AssertReconstructable(Expression<Action<IX>> expected, Action<IX> action)
@@ -336,13 +322,6 @@ public void Stops_before_non_interceptable_property()
             public void Stops_after_non_interceptable_return_type()
             {
                 AssertFailsAfter<IX>("x => x.SealedY...", x => x.SealedY.Method());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private void AssertFailsAfter<TRoot>(string expectedPartial, Action<TRoot> action)
-                After:
-                            void AssertFailsAfter<TRoot>(string expectedPartial, Action<TRoot> action)
-                */
             }
 
             void AssertFailsAfter<TRoot>(string expectedPartial, Action<TRoot> action)
@@ -394,27 +373,13 @@ public void Indexer_with_default_value_on_lfs_and_matcher_on_rhs_both_having_sam
                 AssertIncorrectlyReconstructsAs(
                     "x => x[It.IsAny<int>()] = 0",
                      x => x[0] = It.IsAny<int>());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private void AssertIncorrectlyReconstructsAs(string expected, Action<IX> action)
-                After:
-                            void AssertIncorrectlyReconstructsAs(string expected, Action<IX> action)
-                */
             }
 
             void AssertIncorrectlyReconstructsAs(string expected, Action<IX> action)
             {
                 Expression actual = ActionObserver.Instance.ReconstructExpression(action);
                 actual = PrepareForComparison.Instance.Visit(actual);
                 Assert.Equal(expected, actual.ToStringFixed());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private void AssertIncorrectlyReconstructsAs(Expression<Action<IX>> expected, Action<IX> action)
-                After:
-                            void AssertIncorrectlyReconstructsAs(Expression<Action<IX>> expected, Action<IX> action)
-                */
             }
 
             void AssertIncorrectlyReconstructsAs(Expression<Action<IX>> expected, Action<IX> action)
@@ -429,13 +394,6 @@ public interface IX
             {
                 int this[int index] { get; set; }
                 void Method(int arg1, int arg2);
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                        private sealed class PrepareForComparison : ExpressionVisitor
-                After:
-                        sealed class PrepareForComparison : ExpressionVisitor
-                */
             }
         }
 

src/Moq.Tests/AfterReturnCallbackDelegateValidationFixture.cs

@@ -10,13 +10,6 @@
 namespace Moq.Tests
 {
     public class AfterReturnCallbackDelegateValidationFixture
-
-    /* Unmerged change from project 'Moq.Tests(net6.0)'
-    Before:
-            private readonly ISetup<IFoo, bool> setup;
-    After:
-            readonly ISetup<IFoo, bool> setup;
-    */
     {
         readonly ISetup<IFoo, bool> setup;
 

src/Moq.Tests/CSharpCompilerExpressionsFixture.cs

@@ -130,54 +130,24 @@ public interface IX
                 void NullableInt(int? arg);
                 void Object(object arg);
                 void Short(long arg);
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private static void AssertConvert(Expression<Action<IX>> expression)
-                After:
-                            static void AssertConvert(Expression<Action<IX>> expression)
-                */
             }
 
             static void AssertConvert(Expression<Action<IX>> expression)
             {
                 var visitor = new FilteringVisitor(e => e.NodeType == ExpressionType.Convert);
                 visitor.Visit(expression.Body);
                 Assert.True(visitor.Result.Any());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                            private static void AssertNoConvert(Expression<Action<IX>> expression)
-                After:
-                            static void AssertNoConvert(Expression<Action<IX>> expression)
-                */
             }
 
             static void AssertNoConvert(Expression<Action<IX>> expression)
             {
                 var visitor = new FilteringVisitor(e => e.NodeType == ExpressionType.Convert);
                 visitor.Visit(expression.Body);
                 Assert.False(visitor.Result.Any());
-
-                /* Unmerged change from project 'Moq.Tests(net6.0)'
-                Before:
-                        private sealed class FilteringVisitor : ExpressionVisitor
-                After:
-                        sealed class FilteringVisitor : ExpressionVisitor
-                */
             }
         }
 
         sealed class FilteringVisitor : ExpressionVisitor
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                    private readonly Func<Expression, bool> predicate;
-                    private readonly List<Expression> result;
-        After:
-                    readonly Func<Expression, bool> predicate;
-                    readonly List<Expression> result;
-        */
         {
             readonly Func<Expression, bool> predicate;
             readonly List<Expression> result;

src/Moq.Tests/CallbackDelegateValidationFixture.cs

@@ -17,13 +17,6 @@ namespace Moq.Tests
     /// </summary>
     /// <seealso cref="ReturnsDelegateValidationFixture"/>
     public class CallbackDelegateValidationFixture
-
-    /* Unmerged change from project 'Moq.Tests(net6.0)'
-    Before:
-            private ISetup<IFoo> setup;
-    After:
-            ISetup<IFoo> setup;
-    */
     {
         ISetup<IFoo> setup;
 

src/Moq.Tests/CallbacksFixture.cs

@@ -539,13 +539,6 @@ public class Base
         }
 
         public class Derived : Base
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                private void TraceMe(Base b)
-        After:
-                void TraceMe(Base b)
-        */
         {
         }
 

src/Moq.Tests/CustomDefaultValueProviderFixture.cs

@@ -99,23 +99,9 @@ public interface IFoo
             int GetValue();
             int[] GetValues();
             IFoo Inner { get; }
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private sealed class ConstantDefaultValueProvider : DefaultValueProvider
-            After:
-                    sealed class ConstantDefaultValueProvider : DefaultValueProvider
-            */
         }
 
         sealed class ConstantDefaultValueProvider : DefaultValueProvider
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                    private object value;
-        After:
-                    object value;
-        */
         {
             object value;
 

src/Moq.Tests/CustomTypeMatchersFixture.cs

@@ -258,13 +258,6 @@ public PickyIntOrString() : base(typeof(int), typeof(string))
 
         [TypeMatcher]
         public class Picky : ITypeMatcher
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                    private readonly Type[] types;
-        After:
-                    readonly Type[] types;
-        */
         {
             readonly Type[] types;
 
@@ -301,13 +294,6 @@ public struct AnyStruct : ITypeMatcher
         }
 
         public class ObjectStringOrdinalIgnoreCaseComparer : IEqualityComparer<object>
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                    private static IEqualityComparer<string> InternalComparer => StringComparer.OrdinalIgnoreCase;
-        After:
-                    static IEqualityComparer<string> InternalComparer => StringComparer.OrdinalIgnoreCase;
-        */
         {
             static IEqualityComparer<string> InternalComparer => StringComparer.OrdinalIgnoreCase;
 

src/Moq.Tests/DefaultValueProviderFixture.cs

@@ -12,31 +12,11 @@ namespace Moq.Tests
     /// Tests for the <see cref="DefaultValueProvider"/> abstract base class.
     /// </summary>
     public class DefaultValueProviderFixture
-
-    /* Unmerged change from project 'Moq.Tests(net6.0)'
-    Before:
-            private static MethodInfo fooActionMethod = typeof(IFoo).GetMethod(nameof(IFoo.Action));
-            private static ParameterInfo fooActionMethodParameter = typeof(IFoo).GetMethod(nameof(IFoo.Action)).GetParameters()[0];
-            private static MethodInfo fooFuncMethod = typeof(IFoo).GetMethod(nameof(IFoo.Func));
-    After:
-            static MethodInfo fooActionMethod = typeof(IFoo).GetMethod(nameof(IFoo.Action));
-            static ParameterInfo fooActionMethodParameter = typeof(IFoo).GetMethod(nameof(IFoo.Action)).GetParameters()[0];
-            static MethodInfo fooFuncMethod = typeof(IFoo).GetMethod(nameof(IFoo.Func));
-    */
     {
         static MethodInfo fooActionMethod = typeof(IFoo).GetMethod(nameof(IFoo.Action));
         static ParameterInfo fooActionMethodParameter = typeof(IFoo).GetMethod(nameof(IFoo.Action)).GetParameters()[0];
         static MethodInfo fooFuncMethod = typeof(IFoo).GetMethod(nameof(IFoo.Func));
 
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                private DefaultValueProvider defaultValueProvider;
-                private Mock<IFoo> fooMock;
-        After:
-                DefaultValueProvider defaultValueProvider;
-                Mock<IFoo> fooMock;
-        */
         DefaultValueProvider defaultValueProvider;
         Mock<IFoo> fooMock;
 
@@ -74,13 +54,6 @@ public interface IFoo
         {
             void Action(object arg);
             object Func();
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private sealed class DefaultValueProviderStub : DefaultValueProvider
-            After:
-                    sealed class DefaultValueProviderStub : DefaultValueProvider
-            */
         }
 
         sealed class DefaultValueProviderStub : DefaultValueProvider

src/Moq.Tests/Demo.cs

@@ -8,13 +8,6 @@
 namespace Moq.Tests
 {
     public class Demo
-
-    /* Unmerged change from project 'Moq.Tests(net6.0)'
-    Before:
-            private static string TALISKER = "Talisker";
-    After:
-            static string TALISKER = "Talisker";
-    */
     {
         static string TALISKER = "Talisker";
 
@@ -91,13 +84,6 @@ public OrdersPresenter(IOrdersView view)
 
             public Order SelectedOrder { get; private set; }
 
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                        private void DoOrderSelection(Order selectedOrder)
-            After:
-                        void DoOrderSelection(Order selectedOrder)
-            */
             void DoOrderSelection(Order selectedOrder)
             {
                 // Do something when the view selects an order.

src/Moq.Tests/EmptyDefaultValueProviderFixture.cs

@@ -187,13 +187,6 @@ public void ProvidesDefaultValueTupleOfReferenceTypeArrayAndTaskOfReferenceType(
             Assert.NotNull(barTask);
             Assert.True(barTask.IsCompleted);
             Assert.Equal(default(IBar), barTask.Result);
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private static object GetDefaultValueForProperty(string propertyName)
-            After:
-                    static object GetDefaultValueForProperty(string propertyName)
-            */
         }
 
         static object GetDefaultValueForProperty(string propertyName)

src/Moq.Tests/ExpressionExtensionsFixture.cs

@@ -109,62 +109,25 @@ public void ToPropertyInfo_does_not_correct_DeclaringType_for_base_properties()
             var actual = expression.ToPropertyInfo();
 
             Assert.Same(expected, actual);
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private LambdaExpression ToExpression<T>(Expression<Func<T>> expression)
-            After:
-                    LambdaExpression ToExpression<T>(Expression<Func<T>> expression)
-            */
         }
 
         LambdaExpression ToExpression<T>(Expression<Func<T>> expression)
         {
             return expression;
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private LambdaExpression ToExpression<T>(Expression<Action<T>> expression)
-            After:
-                    LambdaExpression ToExpression<T>(Expression<Action<T>> expression)
-            */
         }
 
         LambdaExpression ToExpression<T>(Expression<Action<T>> expression)
         {
             return expression;
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private LambdaExpression ToExpression<T, TResult>(Expression<Func<T, TResult>> expression)
-            After:
-                    LambdaExpression ToExpression<T, TResult>(Expression<Func<T, TResult>> expression)
-            */
         }
 
         LambdaExpression ToExpression<T, TResult>(Expression<Func<T, TResult>> expression)
         {
             return expression;
-
-            /* Unmerged change from project 'Moq.Tests(net6.0)'
-            Before:
-                    private void Do<T>(T value) { }
-            After:
-                    void Do<T>(T value) { }
-            */
         }
 
         void Do<T>(T value) { }
 
-
-        /* Unmerged change from project 'Moq.Tests(net6.0)'
-        Before:
-                private static void DoStatic(int value) { }
-                private static void DoStaticGeneric<T>(T value) { }
-        After:
-                static void DoStatic(int value) { }
-                static void DoStaticGeneric<T>(T value) { }
-        */
         static void DoStatic(int value) { }
         static void DoStaticGeneric<T>(T value) { }