move to Verify

.editorconfig

@@ -29,3 +29,13 @@ dotnet_style_qualification_for_field=false:warning
 dotnet_style_qualification_for_method=false:warning
 dotnet_style_qualification_for_property=false:warning
 dotnet_style_require_accessibility_modifiers=for_non_interface_members:hint
+
+# Verify
+[*.{received,verified}.{txt}]
+charset = utf-8-bom
+end_of_line = lf
+indent_size = unset
+indent_style = unset
+insert_final_newline = false
+tab_width = unset
+trim_trailing_whitespace = false

.gitattributes

@@ -46,3 +46,6 @@
 #   treat as binary
 ###############################################################################
 *.snk       binary
+
+# Verify
+*.verified.txt text eol=lf working-tree-encoding=UTF-8

.gitignore

@@ -153,5 +153,5 @@ TestResults/
 .fake
 .ionide
 
-# ApprovalTests
+# Verify
 *.received.txt

Directory.Packages.props

@@ -1,31 +1,27 @@
 <Project>
-
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
     <!-- Using multiple feeds isn't supported by Maestro: https://github.com/dotnet/arcade/issues/14155. -->
     <NoWarn>$(NoWarn);NU1507</NoWarn>
   </PropertyGroup>
-
   <ItemGroup>
     <!-- Roslyn dependencies -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.0.1" />
     <!-- Runtime dependencies -->
     <PackageVersion Include="Microsoft.Bcl.Memory" Version="9.0.6" />
     <!-- external dependencies -->
-    <PackageVersion Include="ApprovalTests" Version="7.0.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.13.1" />
     <PackageVersion Include="AwesomeAssertions" Version="8.1.0" />
     <PackageVersion Include="Microsoft.DotNet.PlatformAbstractions" Version="3.1.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="Verify.Xunit" Version="30.4.0" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(DisableArcade)' == '1'">
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <!-- The xunit version should be kept in sync with the one that Arcade promotes -->
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
+    <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />
   </ItemGroup>
-
 </Project>

eng/Versions.props

@@ -3,5 +3,10 @@
   <PropertyGroup>
     <VersionPrefix>2.0.0</VersionPrefix>
     <PreReleaseVersionLabel>beta7</PreReleaseVersionLabel>
+
+    <XUnitVersion>2.9.3</XUnitVersion>
+    <XUnitAnalyzersVersion>1.22.0</XUnitAnalyzersVersion>
+    <XUnitRunnerVisualStudioVersion>3.1.1</XUnitRunnerVisualStudioVersion>
+
   </PropertyGroup>
 </Project>

src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs → src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs

@@ -1,19 +1,18 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using ApprovalTests;
-using ApprovalTests.Reporters;
+using System.Threading.Tasks;
+using VerifyXunit;
 using Xunit;
 
 namespace System.CommandLine.ApiCompatibility.Tests;
 
-public class ApiCompatibilityApprovalTests
+public class ApiCompatibilityTests
 {
     [Fact]
-    [UseReporter(typeof(DiffReporter))]
-    public void System_CommandLine_api_is_not_changed()
+    public Task System_CommandLine_api_is_not_changed()
     {
         var contract = ApiContract.GenerateContractForAssembly(typeof(ParseResult).Assembly);
-        Approvals.Verify(contract);
+        return Verifier.Verify(contract);
     }
 }

src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj

@@ -1,3 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
@@ -5,11 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" />
+    <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\System.CommandLine\System.CommandLine.csproj" />
+    <PackageReference Include="Verify.Xunit" />
   </ItemGroup>
 
 </Project>

src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs

@@ -3,16 +3,15 @@
 
 using Xunit;
 using System.IO;
-using ApprovalTests;
-using ApprovalTests.Reporters;
+using System.Threading.Tasks;
+using VerifyXunit;
 
 namespace System.CommandLine.Tests.Help
 {
     public partial class HelpBuilderTests
     {
         [Fact]
-        [UseReporter(typeof(DiffReporter))]
-        public void Help_layout_has_not_changed()
+        public Task Help_layout_has_not_changed()
         {
             var command = new Command("the-root-command", "Test description")
             {
@@ -75,7 +74,7 @@ public void Help_layout_has_not_changed()
 
             StringWriter writer = new();
             GetHelpBuilder(LargeMaxWidth).Write(command, writer);
-            Approvals.Verify(writer.ToString());
+            return Verifier.Verify(writer.ToString());
         }
     }
 }

src/System.CommandLine.Tests/System.CommandLine.Tests.csproj

@@ -30,10 +30,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ApprovalTests" />
     <PackageReference Include="AwesomeAssertions" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
+    <PackageReference Include="Verify.Xunit" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DisableArcade)' == '1'">

src/System.CommandLine.Tests/VerifyChecksTests.cs

@@ -0,0 +1,10 @@
+using System.Threading.Tasks;
+using VerifyXunit;
+using Xunit;
+
+public class VerifyChecksTests
+{
+    [Fact]
+    public Task Run() =>
+        VerifyChecks.Run();
+}