Merge pull request #1294 from dotnet/dependabot/nuget/Rx.NET/Source/V…

…erify.Xunit-6.21.0 Bump Verify.Xunit from 1.34.2 to 6.21.0 in /Rx.NET/Source
dotnet · Sep 25, 2020 · 75d840b · 75d840b
2 parents 1422899 + 3e5916e
commit 75d840b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.cs
@@ -7,20 +7,19 @@
 using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
-using Verify;
+using VerifyTests;
 using VerifyXunit;
 using Xunit;
-using Xunit.Abstractions;
 
 namespace ReactiveTests.Tests.Api
 {
     public class ApiApprovalTests :
         VerifyBase
     {
-        VerifySettings verifySettings;
+        private readonly VerifySettings verifySettings;
 
-        public ApiApprovalTests(ITestOutputHelper output) :
-            base(output)
+        public ApiApprovalTests()
+            : base()
         {
             verifySettings = new VerifySettings();
             verifySettings.UseExtension("cs");
@@ -64,6 +63,7 @@ private static string Filter(string text)
                                                         .Where(l => !l.StartsWith("[assembly: AssemblyFileVersion("))
                                                         .Where(l => !l.StartsWith("[assembly: AssemblyInformationalVersion("))
                                                         .Where(l => !l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(\"CommitHash\""))
+                                                        .Where(l => !l.StartsWith("[assembly: System.Reflection.AssemblyMetadata(\"RepositoryUrl\""))
                                                         .Where(l => !string.IsNullOrWhiteSpace(l))
             );
         }

diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/DiffPlexReporter.cs b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/DiffPlexReporter.cs
@@ -2,6 +2,8 @@
 // The .NET Foundation licenses this file to you under the MIT License.
 // See the LICENSE file in the project root for more information. 
 
+#nullable enable
+
 using System;
 using System.IO;
 using System.Threading.Tasks;
@@ -13,9 +15,9 @@ namespace ReactiveTests.Tests
 {
     public static class DiffPlexReporter
     {
-        public static async Task Report(string receivedFile, string verifiedFile)
+        public static Task Report(string receivedFile, string verifiedFile, string? message)
         {
-            #if(!DEBUG)
+#if (!DEBUG)
             var receivedText = File.ReadAllText(receivedFile);
             var verifiedText = File.ReadAllText(verifiedFile);
             var diffBuilder = new InlineDiffBuilder(new Differ());
@@ -38,7 +40,9 @@ public static async Task Report(string receivedFile, string verifiedFile)
 
                 Console.WriteLine("{0}{1}", prefix, line.Text);
             }
-            #endif
+#endif
+
+            return Task.CompletedTask;
         }
     }
 }
diff --git a/...Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj b/...Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
-    <PackageReference Include="Verify.Xunit" Version="1.34.2" />
+    <PackageReference Include="Verify.Xunit" Version="6.21.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="DiffPlex" Version="1.6.3" />