Upgrade xunit to get newer asserts

eng/Versions.props

@@ -230,15 +230,15 @@
     <VsWebsiteInteropVersion>8.0.50727</VsWebsiteInteropVersion>
     <vswhereVersion>2.4.1</vswhereVersion>
     <XamarinMacVersion>1.0.0</XamarinMacVersion>
-    <xunitVersion>2.4.1-pre.build.4059</xunitVersion>
+    <xunitVersion>2.4.2-pre.13</xunitVersion>
     <xunitanalyzersVersion>0.10.0</xunitanalyzersVersion>
     <xunitassertVersion>$(xunitVersion)</xunitassertVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <XUnitXmlTestLoggerVersion>2.1.26</XUnitXmlTestLoggerVersion>
     <xunitextensibilitycoreVersion>$(xunitVersion)</xunitextensibilitycoreVersion>
-    <xunitrunnerconsoleVersion>2.4.1-pre.build.4059</xunitrunnerconsoleVersion>
+    <xunitrunnerconsoleVersion>$(xunitVersion)</xunitrunnerconsoleVersion>
     <xunitrunnerwpfVersion>1.0.51</xunitrunnerwpfVersion>
-    <xunitrunnervisualstudioVersion>$(xunitVersion)</xunitrunnervisualstudioVersion>
+    <xunitrunnervisualstudioVersion>2.4.3</xunitrunnervisualstudioVersion>
     <xunitextensibilityexecutionVersion>$(xunitVersion)</xunitextensibilityexecutionVersion>
     <runtimeWinX64MicrosoftNETCoreILAsmPackageVersion>$(ILAsmPackageVersion)</runtimeWinX64MicrosoftNETCoreILAsmPackageVersion>
     <runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion>$(ILAsmPackageVersion)</runtimeLinuxX64MicrosoftNETCoreILAsmPackageVersion>

src/Compilers/CSharp/Test/Syntax/LexicalAndXml/DocumentationCommentLexerTestBase.cs

@@ -48,12 +48,12 @@ internal void AssertTokens(string text, params TokenDescription[] expected)
                     else if (!actualHadNext)
                     {
                         Assert.True(expectedHadNext);
-                        AssertEx.Fail("Unmatched expected: " + expectedEnumerator.Current);
+                        Assert.Fail("Unmatched expected: " + expectedEnumerator.Current);
                     }
                     else if (!expectedHadNext)
                     {
                         Assert.True(actualHadNext);
-                        AssertEx.Fail("Unmatched actual: " + expectedEnumerator.Current);
+                        Assert.Fail("Unmatched actual: " + expectedEnumerator.Current);
                     }
 
                     var actualToken = actualEnumerator.Current;

src/Compilers/CSharp/Test/Syntax/Syntax/SyntaxFactoryTests.cs

@@ -110,7 +110,7 @@ public void TestFreeFormTokenFactory_NonTokenKind()
             try
             {
                 SyntaxFactory.Token(SyntaxKind.IdentifierName);
-                AssertEx.Fail("Should have thrown - can't create an IdentifierName token");
+                Assert.Fail("Should have thrown - can't create an IdentifierName token");
                 return;
             }
             catch (Exception e)
@@ -136,7 +136,7 @@ public void TestFreeFormTokenFactory_SpecialTokenKinds()
                 try
                 {
                     SyntaxFactory.Token(default(SyntaxTriviaList), SyntaxKind.IdentifierToken, "text", "valueText", default(SyntaxTriviaList));
-                    AssertEx.Fail("Should have thrown");
+                    Assert.Fail("Should have thrown");
                     return;
                 }
                 catch (ArgumentException e)
@@ -147,7 +147,7 @@ public void TestFreeFormTokenFactory_SpecialTokenKinds()
                 try
                 {
                     SyntaxFactory.Token(default(SyntaxTriviaList), SyntaxKind.CharacterLiteralToken, "text", "valueText", default(SyntaxTriviaList));
-                    AssertEx.Fail("Should have thrown");
+                    Assert.Fail("Should have thrown");
                     return;
                 }
                 catch (ArgumentException e)
@@ -158,7 +158,7 @@ public void TestFreeFormTokenFactory_SpecialTokenKinds()
                 try
                 {
                     SyntaxFactory.Token(default(SyntaxTriviaList), SyntaxKind.NumericLiteralToken, "text", "valueText", default(SyntaxTriviaList));
-                    AssertEx.Fail("Should have thrown");
+                    Assert.Fail("Should have thrown");
                     return;
                 }
                 catch (ArgumentException e)

src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListBuilderTest.cs

@@ -361,7 +361,8 @@ public void DebuggerAttributesValid()
             builder.Add("Two");
             DebuggerAttributeInfo info = DebuggerAttributes.ValidateDebuggerTypeProxyProperties(builder);
             PropertyInfo itemProperty = info.Properties.Single(pr => pr.GetCustomAttribute<DebuggerBrowsableAttribute>()!.State == DebuggerBrowsableState.RootHidden);
-            string[]? items = itemProperty.GetValue(info.Instance) as string[];
+            string[]? items = (string[]?)itemProperty.GetValue(info.Instance);
+            Assert.NotNull(items);
             Assert.Equal(builder, items);
         }
 

src/Compilers/Core/CodeAnalysisTest/Collections/ImmutableSegmentedListTest.cs

@@ -776,7 +776,8 @@ public void DebuggerAttributesValid()
             object? rootNode = DebuggerAttributes.GetFieldValue(ImmutableSegmentedList.Create<string>("1", "2", "3"), "_root")!;
             DebuggerAttributes.ValidateDebuggerDisplayReferences(rootNode);
             PropertyInfo itemProperty = info.Properties.Single(pr => pr.GetCustomAttribute<DebuggerBrowsableAttribute>()!.State == DebuggerBrowsableState.RootHidden);
-            double[]? items = itemProperty.GetValue(info.Instance) as double[];
+            double[]? items = (double[]?)itemProperty.GetValue(info.Instance);
+            Assert.NotNull(items);
             Assert.Equal(list, items);
         }
 

src/Compilers/Core/CodeAnalysisTest/DefaultAnalyzerAssemblyLoaderTests.cs

@@ -49,9 +49,9 @@ public void LoadWithDependency()
             loader.AddDependencyLocation(analyzerDependencyFile.Path);
 
             var analyzerMainReference = new AnalyzerFileReference(analyzerMainFile.Path, loader);
-            analyzerMainReference.AnalyzerLoadFailed += (_, e) => AssertEx.Fail(e.Exception!.Message);
+            analyzerMainReference.AnalyzerLoadFailed += (_, e) => Assert.Fail(e.Exception!.Message);
             var analyzerDependencyReference = new AnalyzerFileReference(analyzerDependencyFile.Path, loader);
-            analyzerDependencyReference.AnalyzerLoadFailed += (_, e) => AssertEx.Fail(e.Exception!.Message);
+            analyzerDependencyReference.AnalyzerLoadFailed += (_, e) => Assert.Fail(e.Exception!.Message);
 
             var analyzers = analyzerMainReference.GetAnalyzersForAllLanguages();
             Assert.Equal(1, analyzers.Length);

src/Compilers/Core/CodeAnalysisTest/ShadowCopyAnalyzerAssemblyLoaderTests.cs

@@ -33,9 +33,9 @@ public void LoadWithDependency()
             loader.AddDependencyLocation(analyzerDependencyFile.Path);
 
             var analyzerMainReference = new AnalyzerFileReference(analyzerMainFile.Path, loader);
-            analyzerMainReference.AnalyzerLoadFailed += (_, e) => AssertEx.Fail(e.Exception!.Message);
+            analyzerMainReference.AnalyzerLoadFailed += (_, e) => Assert.Fail(e.Exception!.Message);
             var analyzerDependencyReference = new AnalyzerFileReference(analyzerDependencyFile.Path, loader);
-            analyzerDependencyReference.AnalyzerLoadFailed += (_, e) => AssertEx.Fail(e.Exception!.Message);
+            analyzerDependencyReference.AnalyzerLoadFailed += (_, e) => Assert.Fail(e.Exception!.Message);
 
             var analyzers = analyzerMainReference.GetAnalyzersForAllLanguages();
             Assert.Equal(1, analyzers.Length);

src/Compilers/Core/CodeAnalysisTest/SourceFileResolverTest.cs

@@ -34,7 +34,7 @@ public void IncorrectPathmaps()
                     ImmutableArray.Create(""),
                     isABaseDirectory,
                     ImmutableArray.Create(KeyValuePairUtil.Create<string, string>("key", null)));
-                AssertEx.Fail("Didn't throw");
+                Assert.Fail("Didn't throw");
             }
             catch (ArgumentException argException)
             {
@@ -57,7 +57,7 @@ public void BadBaseDirectory()
                     ImmutableArray.Create(""),
                     "not_a_root directory",
                     ImmutableArray.Create(KeyValuePairUtil.Create<string, string>("key", "value")));
-                AssertEx.Fail("Didn't throw");
+                Assert.Fail("Didn't throw");
             }
             catch (ArgumentException argException)
             {

src/Compilers/Core/MSBuildTaskTests/MapSourceRootTests.cs

@@ -340,7 +340,7 @@ public void MetadataMerge1(bool deterministic)
                     "MapSourceRoots.ContainsDuplicate", "SourceRoot", path1, "SourceLinkUrl", "URL1", "URL2")) + Environment.NewLine,
                 engine.Log);
 
-            AssertEx.NotNull(task.MappedSourceRoots);
+            Assert.NotNull(task.MappedSourceRoots);
             AssertEx.Equal(new[]
             {
                 $"'{path1}' SourceControl='git' RevisionId='RevId1' NestedRoot='NR1A' ContainingRoot='{path3}' MappedPath='{(deterministic ? "/_/NR1A/" : path1)}' SourceLinkUrl='URL1'",
@@ -445,7 +445,7 @@ public void Error_NoTopLevelSourceRoot(bool deterministic)
             }
             else
             {
-                AssertEx.NotNull(task.MappedSourceRoots);
+                Assert.NotNull(task.MappedSourceRoots);
                 AssertEx.Equal(new[]
                 {
                     $"'{path1}' SourceControl='' RevisionId='' NestedRoot='a/b' ContainingRoot='{path1}' MappedPath='{path1}' SourceLinkUrl=''",

src/Compilers/Core/MSBuildTaskTests/TargetTests.cs

@@ -263,15 +263,15 @@ public void GenerateEditorConfigCoreEvaluatesMetadata()
             Assert.Equal("_GeneratedEditorConfigMetadata", item.ItemType);
 
             var itemType = item.Metadata.SingleOrDefault(m => m.Name == "ItemType");
-            AssertEx.NotNull(itemType);
+            Assert.NotNull(itemType);
             Assert.Equal("Compile", itemType.EvaluatedValue);
 
             var metaName = item.Metadata.SingleOrDefault(m => m.Name == "MetadataName");
-            AssertEx.NotNull(metaName);
+            Assert.NotNull(metaName);
             Assert.Equal("CustomMeta", metaName.EvaluatedValue);
 
             var customMeta = item.Metadata.SingleOrDefault(m => m.Name == metaName.EvaluatedValue);
-            AssertEx.NotNull(customMeta);
+            Assert.NotNull(customMeta);
             Assert.Equal("abc", customMeta.EvaluatedValue);
         }
 
@@ -305,15 +305,15 @@ public void GenerateEditorConfigCoreEvaluatesDynamicMetadata()
             Assert.Equal("_GeneratedEditorConfigMetadata", item.ItemType);
 
             var itemType = item.Metadata.SingleOrDefault(m => m.Name == "ItemType");
-            AssertEx.NotNull(itemType);
+            Assert.NotNull(itemType);
             Assert.Equal("Compile", itemType.EvaluatedValue);
 
             var metaName = item.Metadata.SingleOrDefault(m => m.Name == "MetadataName");
-            AssertEx.NotNull(metaName);
+            Assert.NotNull(metaName);
             Assert.Equal("CustomMeta", metaName.EvaluatedValue);
 
             var customMeta = item.Metadata.SingleOrDefault(m => m.Name == metaName.EvaluatedValue);
-            AssertEx.NotNull(customMeta);
+            Assert.NotNull(customMeta);
             Assert.Equal("abc", customMeta.EvaluatedValue);
         }
 
@@ -345,11 +345,11 @@ public void GenerateEditorConfigCoreHandlesMissingMetadata()
             Assert.Equal("_GeneratedEditorConfigMetadata", item.ItemType);
 
             var itemType = item.Metadata.SingleOrDefault(m => m.Name == "ItemType");
-            AssertEx.NotNull(itemType);
+            Assert.NotNull(itemType);
             Assert.Equal("Compile", itemType.EvaluatedValue);
 
             var metaName = item.Metadata.SingleOrDefault(m => m.Name == "MetadataName");
-            AssertEx.NotNull(metaName);
+            Assert.NotNull(metaName);
             Assert.Equal("CustomMeta", metaName.EvaluatedValue);
         }
 
@@ -380,11 +380,11 @@ public void GenerateEditorConfigCoreHandlesMalformedCompilerVisibleItemMetadata(
             Assert.Equal("_GeneratedEditorConfigMetadata", item.ItemType);
 
             var itemType = item.Metadata.SingleOrDefault(m => m.Name == "ItemType");
-            AssertEx.NotNull(itemType);
+            Assert.NotNull(itemType);
             Assert.Equal("Compile", itemType.EvaluatedValue);
 
             var metaName = item.Metadata.SingleOrDefault(m => m.Name == "MetadataName");
-            AssertEx.NotNull(metaName);
+            Assert.NotNull(metaName);
             Assert.Equal("", metaName.EvaluatedValue);
         }
 

src/Compilers/Core/RebuildTest/CompilationOptionsReaderTests.cs

@@ -32,7 +32,7 @@ private CompilationOptionsReader GetOptionsReader(Compilation compilation)
             var peBytes = compilation.EmitToArray(new EmitOptions(debugInformationFormat: DebugInformationFormat.Embedded));
             var originalReader = new PEReader(peBytes);
             var originalPdbReader = originalReader.GetEmbeddedPdbMetadataReader();
-            AssertEx.NotNull(originalPdbReader);
+            Assert.NotNull(originalPdbReader);
             var factory = LoggerFactory.Create(configure => { });
             var logger = factory.CreateLogger("RoundTripVerification");
             return new CompilationOptionsReader(logger, originalPdbReader, originalReader);

src/Compilers/Core/RebuildTest/RebuildCommandLineTests.cs

@@ -112,7 +112,7 @@ private void VerifyRoundTrip(CommonCompiler commonCompiler, string peFilePath, s
                 errorLoggerOpt: null,
                 analyzerConfigOptions: default,
                 globalConfigOptions: default);
-            AssertEx.NotNull(compilation);
+            Assert.NotNull(compilation);
             RoundTripUtil.VerifyCompilationOptions(commonCompiler.Arguments.CompilationOptions, compilation.Options);
 
             RoundTripUtil.VerifyRoundTrip(

src/Compilers/Server/VBCSCompilerTests/CompilerServerTests.cs

@@ -249,13 +249,13 @@ private static (T Result, string Output) UseTextWriter<T>(Encoding encoding, Fun
                         currentDirectory: tempDir);
                     if (result.ExitCode != 0)
                     {
-                        AssertEx.Fail($"Deterministic compile failed \n stdout:  { result.Output }");
+                        Assert.Fail($"Deterministic compile failed \n stdout:  { result.Output }");
                     }
                     var listener = await serverData.Complete();
                     Assert.Equal(CompletionData.RequestCompleted, listener.CompletionDataList.Single());
                 }
                 var bytes = File.ReadAllBytes(outFile);
-                AssertEx.NotNull(bytes);
+                Assert.NotNull(bytes);
 
                 return (bytes, finalFlags);
             }
@@ -1516,7 +1516,7 @@ private async Task RunDeterministicTest(string source)
             {
                 if (first[i] != second[i])
                 {
-                    AssertEx.Fail($"Bytes were different at position { i } ({ first[i] } vs { second[i] }).  Flags used were (\"{ finalFlags1 }\" vs \"{ finalFlags2 }\")");
+                    Assert.Fail($"Bytes were different at position { i } ({ first[i] } vs { second[i] }).  Flags used were (\"{ finalFlags1 }\" vs \"{ finalFlags2 }\")");
                 }
             }
         }

src/Compilers/Server/VBCSCompilerTests/NamedPipeClientConnectionHostTests.cs

@@ -134,7 +134,7 @@ public async Task EndListenClosesQueuedConnections()
             foreach (var streamTask in list)
             {
                 using var stream = await streamTask;
-                AssertEx.NotNull(stream);
+                Assert.NotNull(stream);
                 var readCount = await stream.ReadAsync(buffer, 0, buffer.Length);
                 Assert.Equal(0, readCount);
                 Assert.False(stream.IsConnected);

src/Compilers/Test/Core/Assert/AssertEx.cs

@@ -136,22 +136,22 @@ public static void AreEqual<T>(T expected, T actual, string message = null, IEqu
 
             if (expected == null)
             {
-                Fail("expected was null, but actual wasn't\r\n" + message);
+                Assert.Fail("expected was null, but actual wasn't\r\n" + message);
             }
             else if (actual == null)
             {
-                Fail("actual was null, but expected wasn't\r\n" + message);
+                Assert.Fail("actual was null, but expected wasn't\r\n" + message);
             }
             else
             {
                 if (!(comparer != null ?
                     comparer.Equals(expected, actual) :
                     AssertEqualityComparer<T>.Equals(expected, actual)))
                 {
-                    Fail("Expected and actual were different.\r\n" +
-                         "Expected:\r\n" + expected + "\r\n" +
-                         "Actual:\r\n" + actual + "\r\n" +
-                         message);
+                    Assert.Fail("Expected and actual were different.\r\n" +
+                                "Expected:\r\n" + expected + "\r\n" +
+                                "Actual:\r\n" + actual + "\r\n" +
+                                 message);
                 }
             }
         }
@@ -276,7 +276,7 @@ public static void NotEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual, I
         {
             if (ReferenceEquals(expected, actual))
             {
-                Fail("expected and actual references are identical\r\n" + message);
+                Assert.Fail("expected and actual references are identical\r\n" + message);
             }
 
             if (expected == null || actual == null)
@@ -285,7 +285,7 @@ public static void NotEqual<T>(IEnumerable<T> expected, IEnumerable<T> actual, I
             }
             else if (SequenceEqual(expected, actual, comparer))
             {
-                Fail("expected and actual sequences match\r\n" + message);
+                Assert.Fail("expected and actual sequences match\r\n" + message);
             }
         }
 
@@ -493,16 +493,6 @@ public static string ToString<T>(IEnumerable<T> list, string separator = ", ", F
             return string.Join(separator, list.Select(itemInspector));
         }
 
-        public static void Fail(string message)
-        {
-            throw new Xunit.Sdk.XunitException(message);
-        }
-
-        public static void Fail(string format, params object[] args)
-        {
-            throw new Xunit.Sdk.XunitException(string.Format(format, args));
-        }
-
         public static void NotNull<T>(T @object, string message = null)
         {
             Assert.False(AssertEqualityComparer<T>.IsNull(@object), message);
@@ -700,7 +690,7 @@ public static void Empty<T>(IEnumerable<T> items, string message = "")
             var list = items.ToList();
             if (list.Count != 0)
             {
-                Fail($"Expected 0 items but found {list.Count}: {message}\r\nItems:\r\n    {string.Join("\r\n    ", list)}");
+                Assert.Fail($"Expected 0 items but found {list.Count}: {message}\r\nItems:\r\n    {string.Join("\r\n    ", list)}");
             }
         }
 
@@ -774,14 +764,5 @@ public static void Equal<T>(T[,] expected, Func<int, int, T> getResult, Func<T,
                 Assert.True(false, builder.ToString());
             }
         }
-
-#nullable enable
-        public static void NotNull<T>([NotNull] T value)
-        {
-            Assert.NotNull(value);
-            Debug.Assert(value is object);
-        }
-
-#nullable disable
     }
 }

src/Compilers/Test/Core/InstrumentationChecker.cs

@@ -73,7 +73,7 @@ internal override void Dump(DynamicAnalysisDataReader reader, string[] sourceLin
                     }
                 }
             }
-            AssertEx.Fail(output.ToStringAndFree());
+            Assert.Fail(output.ToStringAndFree());
         }
 
         private static string GetTermination(int index, int length)
@@ -208,7 +208,7 @@ internal override void Dump(DynamicAnalysisDataReader reader, string[] sourceLin
                     }
                 }
             }
-            AssertEx.Fail(output.ToStringAndFree());
+            Assert.Fail(output.ToStringAndFree());
         }
 
         private static string GetTermination(int index, int length)

src/Compilers/Test/Core/Platform/CoreClr/TestExecutionLoadContext.cs

@@ -19,6 +19,7 @@
 using System.Text;
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
+using Xunit;
 
 namespace Roslyn.Test.Utilities.CoreClr
 {
@@ -65,7 +66,10 @@ private Assembly LoadImageAsAssembly(ImmutableArray<byte> mainImage)
             var mainAssembly = LoadImageAsAssembly(mainImage);
             var entryPoint = mainAssembly.EntryPoint;
 
-            AssertEx.NotNull(entryPoint, "Attempting to execute an assembly that has no entrypoint; is your test trying to execute a DLL?");
+            if (entryPoint == null)
+            {
+                Assert.Fail("Attempting to execute an assembly that has no entrypoint; is your test trying to execute a DLL?");
+            }
 
             int exitCode = 0;
             SharedConsole.CaptureOutput(() =>