Correct unit test merge issue (Fact/WinFormsFact).

Author: KlausLoeffelmann

src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests_InvokeAsync.cs

@@ -14,7 +14,7 @@ private sealed class TestControl : Control
         public void DestroyTestHandle() => DestroyHandle();
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_Action_ExecutesOnUIThread()
     {
         using var control = new TestControl();
@@ -55,7 +55,7 @@ void UiAccessAction()
         }
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_FuncT_ExecutesOnUIThread_AndReturnsValue()
     {
         using var control = new TestControl();
@@ -92,7 +92,7 @@ int UiAccessFunc()
         }
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_AsyncCallback_ExecutesOnUIThread()
     {
         using var control = new TestControl();
@@ -178,7 +178,7 @@ async ValueTask UiAccessAsyncCallback(CancellationToken ct)
         }
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_AsyncCallbackT_ExecutesOnUIThread_AndReturnsValue()
     {
         using var control = new TestControl();
@@ -226,7 +226,7 @@ async ValueTask<int> UiAccessAsyncCallback(CancellationToken ct)
         }
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_Action_Cancellation_PreCancelledToken_ReturnsEarly()
     {
         using var control = new TestControl();
@@ -240,7 +240,7 @@ await control.InvokeAsync(
             .ConfigureAwait(false);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_FuncT_Cancellation_PreCancelledToken_ReturnsDefault()
     {
         using var control = new TestControl();
@@ -262,7 +262,7 @@ static ValueTask<int> CallBack(CancellationToken ct)
         }
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_AsyncCallback_Cancellation_PreCancelledToken_ReturnsEarly()
     {
         using var control = new TestControl();
@@ -276,7 +276,7 @@ await control.InvokeAsync(
             cts.Token).ConfigureAwait(true);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_AsyncCallbackT_Cancellation_PreCancelledToken_ReturnsDefault()
     {
         using var control = new TestControl();
@@ -293,10 +293,6 @@ public async Task InvokeAsync_AsyncCallbackT_Cancellation_PreCancelledToken_Retu
     }
 
     [WinFormsFact]
-    [Diagnostics.CodeAnalysis.SuppressMessage(
-     "Performance",
-     "CA1849:Call async methods when in an async method",
-     Justification = "We're blocking for the test on purpose.")]
     public async Task InvokeAsync_Action_Cancellation_BeforeExecution()
     {
         using var control = new TestControl();
@@ -354,7 +350,7 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(
             .ConfigureAwait(false);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_AsyncCallback_Cancellation_WhileRunning()
     {
         using var control = new TestControl();
@@ -374,7 +370,7 @@ await Assert.ThrowsAnyAsync<OperationCanceledException>(
             async () => await task.ConfigureAwait(false)).ConfigureAwait(false);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_Throws_InvalidOperationException_IfHandleNotCreated()
     {
         using var control = new TestControl();
@@ -395,7 +391,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(() =>
             control.InvokeAsync(() => { })).ConfigureAwait(false);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_Propagates_Exception_FromCallback()
     {
         using var control = new TestControl();
@@ -418,7 +414,7 @@ await Assert.ThrowsAsync<InvalidOperationException>(() =>
             .ConfigureAwait(false);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_Reentry_Supported()
     {
         using var control = new TestControl();
@@ -435,7 +431,7 @@ await control.InvokeAsync(() => innerCalled = true, ct)
         Assert.True(innerCalled);
     }
 
-    [Fact]
+    [WinFormsFact]
     public async Task InvokeAsync_MultipleConcurrentCalls_AreThreadSafe()
     {
         using var control = new TestControl();