Merge branch 'approval-update'

(cherry picked from commit 3600254)

Author: michaelklishin

projects/Unit/APIApproval.Approve.approved.txt renamed to projects/Unit/APIApproval.Approve.verified.txt

@@ -1,4 +1,4 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo(@"Unit, PublicKey=00240000048000009400000006020000002400005253413100040000010001008d20ec856aeeb8c3153a77faa2d80e6e43b5db93224a20cc7ae384f65f142e89730e2ff0fcc5d578bbe96fa98a7196c77329efdee4579b3814c0789e5a39b51df6edd75b602a33ceabdfcf19a3feb832f31d8254168cd7ba5700dfbca301fbf8db614ba41ba18474de0a5f4c2d51c995bc3636c641c8cbe76f45717bfcb943b5")]
 namespace RabbitMQ.Client
 {
     public class AmqpTcpEndpoint

projects/Unit/APIApproval.cs

@@ -38,24 +38,30 @@
 //  Copyright (c) 2007-2020 VMware, Inc.  All rights reserved.
 //---------------------------------------------------------------------------
 
-using ApprovalTests;
-using ApprovalTests.Reporters;
-
+using System.Threading.Tasks;
 using NUnit.Framework;
-
 using PublicApiGenerator;
+using Verify;
+using VerifyNUnit;
 
 namespace RabbitMQ.Client.Unit
 {
     [TestFixture]
-    [UseReporter(typeof(QuietReporter))]
     public class APIApproval
     {
         [Test]
-        public void Approve()
+        #if !NETCOREAPP
+        [Ignore("This test is limited to .NET Core targets")]
+        #endif
+        public Task Approve()
         {
             string publicApi = typeof(ConnectionFactory).Assembly.GeneratePublicApi(new ApiGeneratorOptions { ExcludeAttributes = new[] { "System.Runtime.Versioning.TargetFrameworkAttribute" } });
-            Approvals.Verify(publicApi);
+
+            var settings = new VerifySettings();
+            settings.DisableClipboard();
+            settings.DisableDiff();
+
+            return Verifier.Verify(publicApi, settings);
         }
     }
 }

projects/Unit/Unit.csproj

@@ -11,12 +11,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" Version="4.5.2" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageReference Include="NUnit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.16.1" />
     <PackageReference Include="PublicApiGenerator" Version="10.0.2" />
+    <PackageReference Include="Verify.NUnit" Version="1.32.4" />
   </ItemGroup>
 
 </Project>