Upgrade xunit version to 2.9.0

Directory.Build.props

@@ -130,6 +130,9 @@
     <!-- xUnit1004 = warns about skipped tests. Make this a non-fatal build warning. -->
     <WarningsNotAsErrors>$(WarningsNotAsErrors);xUnit1004</WarningsNotAsErrors>
 
+    <!-- don't warn about calling ConfigureAwait in test methods. we already commonly get off the xunit threads because they cause issues. -->
+    <NoWarn>$(NoWarn);xUnit1030</NoWarn>
+
     <!-- don't warn about unnecessary trim warning suppressions. can be removed with preview 6. -->
     <NoWarn>$(NoWarn);IL2121</NoWarn>
 

eng/Versions.props

@@ -322,12 +322,12 @@
     <SwashbuckleAspNetCoreVersion>6.6.2</SwashbuckleAspNetCoreVersion>
     <VerifyXunitVersion>19.14.0</VerifyXunitVersion>
     <XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
-    <XunitAnalyzersVersion>1.0.0</XunitAnalyzersVersion>
-    <XunitVersion>2.4.2</XunitVersion>
+    <XunitAnalyzersVersion>1.15.0</XunitAnalyzersVersion>
+    <XunitVersion>2.9.0</XunitVersion>
     <XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
     <XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
-    <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
+    <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>4.0.5</MicrosoftDataSqlClientVersion>
     <MicrosoftOpenApiVersion>1.6.17</MicrosoftOpenApiVersion>
     <MicrosoftOpenApiReadersVersion>1.6.17</MicrosoftOpenApiReadersVersion>

src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Assert.cs

@@ -18,7 +18,7 @@ public static void DiagnosticLocation(DiagnosticLocation expected, Location actu
         {
             if (actualLinePosition.Line + 1 != expected.Line)
             {
-                throw new DiagnosticLocationAssertException(
+                throw EqualException.ForMismatchedValues(
                     expected,
                     actual,
                     $"Expected diagnostic to be on line \"{expected.Line}\" was actually on line \"{actualLinePosition.Line + 1}\"");
@@ -30,25 +30,11 @@ public static void DiagnosticLocation(DiagnosticLocation expected, Location actu
         {
             if (actualLinePosition.Character + 1 != expected.Column)
             {
-                throw new DiagnosticLocationAssertException(
+                throw EqualException.ForMismatchedValues(
                     expected,
                     actual,
                     $"Expected diagnostic to start at column \"{expected.Column}\" was actually on column \"{actualLinePosition.Character + 1}\"");
             }
         }
     }
-
-    private sealed class DiagnosticLocationAssertException : EqualException
-    {
-        public DiagnosticLocationAssertException(
-            DiagnosticLocation expected,
-            Location actual,
-            string message)
-            : base(expected, actual)
-        {
-            Message = message;
-        }
-
-        public override string Message { get; }
-    }
 }

src/Antiforgery/test/BinaryBlobTest.cs

@@ -56,10 +56,10 @@ public void Ctor_Data()
     [Theory]
     [InlineData((object[]?)null)]
     [InlineData(new byte[] { 0x01, 0x02, 0x03 })]
-    public void Ctor_Data_Bad(byte[] data)
+    public void Ctor_Data_Bad(byte[]? data)
     {
         // Act & assert
-        var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new BinaryBlob(32, data));
+        var ex = Assert.Throws<ArgumentOutOfRangeException>(() => new BinaryBlob(32, data!));
         Assert.Equal("data", ex.ParamName);
     }
 

src/Antiforgery/test/DefaultAntiforgeryTest.cs

@@ -1079,7 +1079,7 @@ public void SetCookieTokenAndHeader_OverridesExistingCachingHeaders()
     [InlineData(true, null)]
     public void SetCookieTokenAndHeader_AddsXFrameOptionsHeader(
         bool suppressXFrameOptions,
-        string expectedHeaderValue)
+        string? expectedHeaderValue)
     {
         // Arrange
         var options = new AntiforgeryOptions()

src/Antiforgery/test/DefaultAntiforgeryTokenStoreTest.cs

@@ -396,7 +396,7 @@ public void SaveCookieToken_HonorsCookieSecurePolicy_OnOptions(
     [InlineData("/", "/")]
     [InlineData("/vdir1", "/vdir1")]
     [InlineData("/vdir1/vdir2", "/vdir1/vdir2")]
-    public void SaveCookieToken_SetsCookieWithApproriatePathBase(string requestPathBase, string expectedCookiePath)
+    public void SaveCookieToken_SetsCookieWithApproriatePathBase(string? requestPathBase, string expectedCookiePath)
     {
         // Arrange
         var token = "serialized-value";

src/Components/Analyzers/test/Verifiers/CodeFixVerifier.cs

@@ -109,7 +109,7 @@ private void VerifyFix(string language, DiagnosticAnalyzer analyzer, CodeFixProv
                 document = document.WithSyntaxRoot(Formatter.Format(document.GetSyntaxRootAsync().Result, Formatter.Annotation, document.Project.Solution.Workspace));
                 newCompilerDiagnostics = GetNewDiagnostics(compilerDiagnostics, GetCompilerDiagnostics(document));
 
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Fix introduced new compiler diagnostics:\r\n{0}\r\n\r\nNew document:\r\n{1}\r\n",

src/Components/Analyzers/test/Verifiers/DiagnosticVerifier.cs

@@ -112,7 +112,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
         {
             string diagnosticsOutput = actualResults.Any() ? FormatDiagnostics(analyzer, actualResults.ToArray()) : "    NONE.";
 
-            Assert.True(false,
+            Assert.Fail(
                 string.Format(CultureInfo.InvariantCulture, "Mismatch between number of diagnostics returned, expected \"{0}\" actual \"{1}\"\r\n\r\nDiagnostics:\r\n{2}\r\n", expectedCount, actualCount, diagnosticsOutput));
         }
 
@@ -125,7 +125,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
             {
                 if (actual.Location != Location.None)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(CultureInfo.InvariantCulture, "Expected:\nA project diagnostic with No location\nActual:\n{0}",
                         FormatDiagnostics(analyzer, actual)));
                 }
@@ -137,7 +137,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
                 if (additionalLocations.Length != expected.Locations.Length - 1)
                 {
-                    Assert.True(false,
+                    Assert.Fail(
                         string.Format(
                             CultureInfo.InvariantCulture,
                             "Expected {0} additional locations but got {1} for Diagnostic:\r\n    {2}\r\n",
@@ -153,7 +153,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Id != expected.Id)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic id to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -162,7 +162,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.Severity != expected.Severity)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic severity to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -171,7 +171,7 @@ private static void VerifyDiagnosticResults(IEnumerable<Diagnostic> actualResult
 
             if (actual.GetMessage(CultureInfo.InvariantCulture) != expected.Message)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic message to be \"{0}\" was \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -204,7 +204,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Line + 1 != expected.Line)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to be on line \"{0}\" was actually on line \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",
@@ -217,7 +217,7 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno
         {
             if (actualLinePosition.Character + 1 != expected.Column)
             {
-                Assert.True(false,
+                Assert.Fail(
                     string.Format(
                         CultureInfo.InvariantCulture,
                         "Expected diagnostic to start at column \"{0}\" was actually at column \"{1}\"\r\n\r\nDiagnostic:\r\n    {2}\r\n",

src/Components/Authorization/test/AuthorizeViewTest.cs

@@ -321,7 +321,7 @@ public async Task RendersAuthorizingUntilAuthorizationCompletedAsync()
         // (This wouldn't happen under the sync context or in wasm)
         var renderTcs = new TaskCompletionSource();
         renderer.OnUpdateDisplayComplete = () => renderTcs.SetResult();
-        authTcs.SetResult(CreateAuthenticationState("Monsieur").Result);
+        authTcs.SetResult(await CreateAuthenticationState("Monsieur"));
 
         await renderTcs.Task;
         Assert.Equal(2, renderer.Batches.Count);
@@ -347,7 +347,7 @@ public async Task RendersAuthorizingUntilAuthorizationCompletedAsync()
     }
 
     [Fact]
-    public void RendersAuthorizingUntilAuthorizationCompleted()
+    public async Task RendersAuthorizingUntilAuthorizationCompleted()
     {
         // Arrange
         var @event = new ManualResetEventSlim();
@@ -377,7 +377,7 @@ public void RendersAuthorizingUntilAuthorizationCompleted()
 
         // Act/Assert 2: Auth process completes asynchronously
         @event.Reset();
-        authTcs.SetResult(CreateAuthenticationState("Monsieur").Result);
+        authTcs.SetResult(await CreateAuthenticationState("Monsieur"));
 
         // We need to wait here because the continuations of SetResult will be scheduled to run asynchronously.
         @event.Wait(Timeout);

src/Components/Components/test/LayoutViewTest.cs

@@ -178,7 +178,7 @@ public void CanChangeContentWithSameLayout()
         // Assert
         Assert.Equal(2, _renderer.Batches.Count);
         var batch = _renderer.Batches[1];
-        Assert.Equal(0, batch.DisposedComponentIDs.Count);
+        Assert.Empty(batch.DisposedComponentIDs);
         Assert.Collection(batch.DiffsInOrder,
             diff => Assert.Empty(diff.Edits), // LayoutView rerendered, but with no changes
             diff => Assert.Empty(diff.Edits), // RootLayout rerendered, but with no changes
@@ -220,7 +220,7 @@ public void CanChangeLayout()
         Assert.True(setParametersTask2.IsCompletedSuccessfully);
         Assert.Equal(2, _renderer.Batches.Count);
         var batch = _renderer.Batches[1];
-        Assert.Equal(1, batch.DisposedComponentIDs.Count); // Disposes NestedLayout
+        Assert.Single(batch.DisposedComponentIDs); // Disposes NestedLayout
         Assert.Collection(batch.DiffsInOrder,
             diff => Assert.Empty(diff.Edits), // LayoutView rerendered, but with no changes
             diff =>

src/Components/Components/test/NavigationManagerTest.cs

@@ -223,7 +223,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationSynchronously_WhenO
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         static ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -250,7 +252,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationSynchronously_WhenM
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(initialHandlerCount, completedHandlerCount);
 
         ValueTask HandleLocationChanging(LocationChangingContext context)
@@ -276,7 +280,9 @@ public void LocationChangingHandlers_CanContinueTheNavigationAsynchronously_When
         Assert.False(navigation1.IsCompleted);
         tcs.SetResult();
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         async ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -328,7 +334,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_WhenOne
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         static ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -357,7 +365,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_WhenMul
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(expectedInvokedHandlerCount, invokedHandlerCount);
 
         ValueTask HandleLocationChanging_AllowNavigation(LocationChangingContext context)
@@ -391,7 +401,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_BeforeR
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.True(currentContext.DidPreventNavigation);
         Assert.True(currentContext.CancellationToken.IsCancellationRequested);
         Assert.False(isHandlerCompleted);
@@ -428,7 +440,9 @@ public void LocationChangingHandlers_CanCancelTheNavigationSynchronously_BeforeR
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.True(currentContext.DidPreventNavigation);
         Assert.True(currentContext.CancellationToken.IsCancellationRequested);
         Assert.False(isFirstHandlerCompleted);
@@ -455,7 +469,7 @@ ValueTask HandleLocationChanging_AllowNavigation(LocationChangingContext context
     }
 
     [Fact]
-    public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenOneHandlerIsRegistered()
+    public async Task LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenOneHandlerIsRegistered()
     {
         // Arrange
         var baseUri = "scheme://host/";
@@ -479,7 +493,7 @@ static async ValueTask HandleLocationChanging(LocationChangingContext context)
     }
 
     [Fact]
-    public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenMultipleHandlersAreRegistered()
+    public async Task LocationChangingHandlers_CanCancelTheNavigationAsynchronously_WhenMultipleHandlersAreRegistered()
     {
         // Arrange
         var baseUri = "scheme://host/";
@@ -503,7 +517,9 @@ public async void LocationChangingHandlers_CanCancelTheNavigationAsynchronously_
 
         // Assert
         Assert.True(navigation1.IsCompletedSuccessfully);
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.False(navigation1.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
         Assert.Equal(blockNavigationHandlerCount, canceledBlockNavigationHandlerCount);
 
         async ValueTask HandleLocationChanging_BlockNavigation(LocationChangingContext context)
@@ -556,11 +572,13 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
         await tcs.Task.WaitAsync(Timeout);
 
         // Assert
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.IsCompletedSuccessfully);
         Assert.False(navigation1.Result);
 
         Assert.True(navigation2.IsCompletedSuccessfully);
         Assert.True(navigation2.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         async ValueTask HandleLocationChanging(LocationChangingContext context)
         {
@@ -615,6 +633,7 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
         await tcs.Task.WaitAsync(Timeout);
 
         // Assert
+#pragma warning disable xUnit1031 // Do not use blocking task operations in test method
         Assert.True(navigation1.IsCompletedSuccessfully);
         Assert.False(navigation1.Result);
 
@@ -623,6 +642,7 @@ public async Task LocationChangingHandlers_AreCanceledBySuccessiveNavigations_Wh
 
         Assert.True(navigation3.IsCompletedSuccessfully);
         Assert.True(navigation3.Result);
+#pragma warning restore xUnit1031 // Do not use blocking task operations in test method
 
         Assert.Equal(expectedCanceledHandlerCount, canceledHandlerCount);
         Assert.Equal(0, completedHandlerCount);

src/Components/Components/test/RendererTest.cs

@@ -3065,8 +3065,8 @@ public void QueuedRenderIsSkippedIfComponentWasAlreadyDisposedInSameBatch()
         // Assert: correct render result
         Assert.True(renderTask.IsCompletedSuccessfully);
         var newBatch = renderer.Batches.Skip(1).Single();
-        Assert.Equal(1, newBatch.DisposedComponentIDs.Count);
-        Assert.Equal(1, newBatch.DiffsByComponentId.Count);
+        Assert.Single(newBatch.DisposedComponentIDs);
+        Assert.Single(newBatch.DiffsByComponentId);
         Assert.Collection(newBatch.DiffsByComponentId[componentId].Single().Edits,
             edit =>
             {
@@ -3433,7 +3433,7 @@ public void DoesNotCallOnAfterRenderForComponentsNotRendered()
         // Assert: Only the re-rendered component was notified of "after render"
         var batch2 = renderer.Batches.Skip(1).Single();
         Assert.Equal(2, batch2.DiffsInOrder.Count); // Parent and first child
-        Assert.Equal(1, batch2.DisposedComponentIDs.Count); // Third child
+        Assert.Single(batch2.DisposedComponentIDs); // Third child
         Assert.Equal(2, childComponents[0].OnAfterRenderCallCount); // Retained and re-rendered
         Assert.Equal(1, childComponents[1].OnAfterRenderCallCount); // Retained and not re-rendered
         Assert.Equal(1, childComponents[2].OnAfterRenderCallCount); // Disposed

src/Components/Components/test/ResourceAssetCollectionTest.cs

@@ -17,7 +17,7 @@ public void CanCreateResourceCollection()
         var collectionAsReadOnlyList = resourceAssetCollection as IReadOnlyList<ResourceAsset>;
 
         // Assert
-        Assert.Equal(1, collectionAsReadOnlyList.Count);
+        Assert.Single(collectionAsReadOnlyList);
         Assert.Equal("image1.jpg", collectionAsReadOnlyList[0].Url);
     }
 

src/Components/Components/test/Routing/RouterTest.cs

@@ -111,7 +111,7 @@ public async Task AlreadyCanceledOnNavigateAsyncDoesNothing()
                 Assert.True(true);
                 return;
             }
-            Assert.True(false, "OnUpdateDisplay called more than once.");
+            Assert.Fail("OnUpdateDisplay called more than once.");
         };
         _router.OnNavigateAsync = new EventCallback<NavigationContext>(null, OnNavigateAsync);
 
@@ -164,7 +164,7 @@ public async Task RefreshesOnceOnCancelledOnNavigateAsync()
                 Assert.True(true);
                 return;
             }
-            Assert.True(false, "OnUpdateDisplay called more than once.");
+            Assert.Fail("OnUpdateDisplay called more than once.");
         };
         _router.OnNavigateAsync = new EventCallback<NavigationContext>(null, OnNavigateAsync);