From 9b748083dbc75eb1c9d40b684c1d4383c3098136 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Fri, 4 Jul 2025 23:49:45 +1000
Subject: [PATCH 1/3] move to Verify

---
 .editorconfig                                 |  10 +
 .gitattributes                                |   3 +
 .gitignore                                    |   4 +-
 Directory.Packages.props                      |  10 +-
 eng/Versions.props                            |   5 +
 ...ommandLine_api_is_not_changed.approved.txt | 274 ------------------
 ...rovalTests.cs => ApiCompatibilityTests.cs} |  12 +-
 ....CommandLine.ApiCompatibility.Tests.csproj |   4 +-
 .../Help/ApprovalTests.Config.cs              |   8 -
 ...s.Help_layout_has_not_changed.approved.txt |  24 --
 .../Help/HelpBuilderTests.Approval.cs         |   9 +-
 .../System.CommandLine.Tests.csproj           |   2 +-
 .../VerifyChecksTests.cs                      |  10 +
 13 files changed, 46 insertions(+), 329 deletions(-)
 delete mode 100644 src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
 rename src/System.CommandLine.ApiCompatibility.Tests/{ApiCompatibilityApprovalTests.cs => ApiCompatibilityTests.cs} (61%)
 delete mode 100644 src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs
 delete mode 100644 src/System.CommandLine.Tests/Help/Approvals/HelpBuilderTests.Help_layout_has_not_changed.approved.txt
 create mode 100644 src/System.CommandLine.Tests/VerifyChecksTests.cs

diff --git a/.editorconfig b/.editorconfig
index acdab74f70..241ebfee58 100644
--- a/.editorconfig
+++ b/.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
diff --git a/.gitattributes b/.gitattributes
index be4c25d817..28d15dce1b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -46,3 +46,6 @@
 #   treat as binary
 ###############################################################################
 *.snk       binary
+
+# Verify
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index c5d5441da2..5fc7e75fe9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,5 +153,5 @@ TestResults/
 .fake
 .ionide
 
-# ApprovalTests
-*.received.txt
+# Verify
+*.verified.txt
diff --git a/Directory.Packages.props b/Directory.Packages.props
index da1e624248..6f89d9b4b0 100644
--- a/Directory.Packages.props
+++ b/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="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
   </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 62f4f4068b..61969816e4 100644
--- a/eng/Versions.props
+++ b/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>
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
deleted file mode 100644
index 45cc9f778a..0000000000
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.System_CommandLine_api_is_not_changed.approved.txt
+++ /dev/null
@@ -1,274 +0,0 @@
-System.CommandLine
-  public abstract class Argument : Symbol
-    public ArgumentArity Arity { get; set; }
-    public System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> CompletionSources { get; }
-    public System.Boolean HasDefaultValue { get; }
-    public System.String HelpName { get; set; }
-    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.ArgumentResult>> Validators { get; }
-    public System.Type ValueType { get; }
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
-    public System.Object GetDefaultValue()
-    public System.String ToString()
-  public class Argument<T> : Argument
-    .ctor(System.String name)
-    public Func<System.CommandLine.Parsing.ArgumentResult,T> CustomParser { get; set; }
-    public Func<System.CommandLine.Parsing.ArgumentResult,T> DefaultValueFactory { get; set; }
-    public System.Boolean HasDefaultValue { get; }
-    public System.Type ValueType { get; }
-  public struct ArgumentArity : System.ValueType, System.IEquatable<ArgumentArity>
-    public static ArgumentArity ExactlyOne { get; }
-    public static ArgumentArity OneOrMore { get; }
-    public static ArgumentArity Zero { get; }
-    public static ArgumentArity ZeroOrMore { get; }
-    public static ArgumentArity ZeroOrOne { get; }
-    .ctor(System.Int32 minimumNumberOfValues, System.Int32 maximumNumberOfValues)
-    public System.Int32 MaximumNumberOfValues { get; }
-    public System.Int32 MinimumNumberOfValues { get; }
-    public System.Boolean Equals(ArgumentArity other)
-    public System.Boolean Equals(System.Object obj)
-    public System.Int32 GetHashCode()
-  public static class ArgumentValidation
-    public static Argument<System.IO.FileInfo> AcceptExistingOnly(this Argument<System.IO.FileInfo> argument)
-    public static Argument<System.IO.DirectoryInfo> AcceptExistingOnly(this Argument<System.IO.DirectoryInfo> argument)
-    public static Argument<System.IO.FileSystemInfo> AcceptExistingOnly(this Argument<System.IO.FileSystemInfo> argument)
-    public static Argument<T> AcceptExistingOnly<T>(this Argument<T> argument)
-    public static Argument<T> AcceptLegalFileNamesOnly<T>(this Argument<T> argument)
-    public static Argument<T> AcceptLegalFilePathsOnly<T>(this Argument<T> argument)
-    public static Argument<T> AcceptOnlyFromAmong<T>(this Argument<T> argument, System.String[] values)
-  public class Command : Symbol, System.Collections.IEnumerable
-    .ctor(System.String name, System.String description = null)
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Collections.Generic.ICollection<System.String> Aliases { get; }
-    public System.Collections.Generic.IList<Argument> Arguments { get; }
-    public System.Collections.Generic.IEnumerable<Symbol> Children { get; }
-    public System.Collections.Generic.IList<Option> Options { get; }
-    public System.Collections.Generic.IList<Command> Subcommands { get; }
-    public System.Boolean TreatUnmatchedTokensAsErrors { get; set; }
-    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.CommandResult>> Validators { get; }
-    public System.Void Add(Argument argument)
-    public System.Void Add(Option option)
-    public System.Void Add(Command command)
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
-    public ParseResult Parse(System.Collections.Generic.IReadOnlyList<System.String> args, CommandLineConfiguration configuration = null)
-    public ParseResult Parse(System.String commandLine, CommandLineConfiguration configuration = null)
-    public System.Void SetAction(System.Action<ParseResult> action)
-    public System.Void SetAction(System.Func<ParseResult,System.Int32> action)
-    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task> action)
-    public System.Void SetAction(System.Func<ParseResult,System.Threading.Tasks.Task> action)
-    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task<System.Int32>> action)
-  public class CommandLineConfiguration
-    .ctor(Command rootCommand)
-    public System.Boolean EnableDefaultExceptionHandler { get; set; }
-    public System.Boolean EnablePosixBundling { get; set; }
-    public System.IO.TextWriter Error { get; set; }
-    public System.IO.TextWriter Output { get; set; }
-    public System.Nullable<System.TimeSpan> ProcessTerminationTimeout { get; set; }
-    public System.CommandLine.Parsing.TryReplaceToken ResponseFileTokenReplacer { get; set; }
-    public Command RootCommand { get; }
-    public System.Int32 Invoke(System.String commandLine)
-    public System.Int32 Invoke(System.String[] args)
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.String commandLine, System.Threading.CancellationToken cancellationToken = null)
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.String[] args, System.Threading.CancellationToken cancellationToken = null)
-    public ParseResult Parse(System.Collections.Generic.IReadOnlyList<System.String> args)
-    public ParseResult Parse(System.String commandLine)
-    public System.Void ThrowIfInvalid()
-  public class CommandLineConfigurationException : System.Exception, System.Runtime.Serialization.ISerializable
-    .ctor(System.String message)
-  public static class CompletionSourceExtensions
-    public static System.Void Add(this System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> completionSources, System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.String>> completionsDelegate)
-    public static System.Void Add(this System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> completionSources, System.String[] completions)
-  public class DiagramDirective : Directive
-    .ctor()
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Int32 ParseErrorReturnValue { get; set; }
-  public class Directive : Symbol
-    .ctor(System.String name)
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
-  public class EnvironmentVariablesDirective : Directive
-    .ctor()
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-  public abstract class Option : Symbol
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Collections.Generic.ICollection<System.String> Aliases { get; }
-    public System.Boolean AllowMultipleArgumentsPerToken { get; set; }
-    public ArgumentArity Arity { get; set; }
-    public System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> CompletionSources { get; }
-    public System.Boolean HasDefaultValue { get; }
-    public System.String HelpName { get; set; }
-    public System.Boolean Recursive { get; set; }
-    public System.Boolean Required { get; set; }
-    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.OptionResult>> Validators { get; }
-    public System.Type ValueType { get; }
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
-    public System.Object GetDefaultValue()
-  public class Option<T> : Option
-    .ctor(System.String name, System.String[] aliases)
-    public Func<System.CommandLine.Parsing.ArgumentResult,T> CustomParser { get; set; }
-    public Func<System.CommandLine.Parsing.ArgumentResult,T> DefaultValueFactory { get; set; }
-    public System.Type ValueType { get; }
-    public Option<T> AcceptLegalFileNamesOnly()
-    public Option<T> AcceptLegalFilePathsOnly()
-    public Option<T> AcceptOnlyFromAmong(System.String[] values)
-  public static class OptionValidation
-    public static Option<System.IO.FileInfo> AcceptExistingOnly(this Option<System.IO.FileInfo> option)
-    public static Option<System.IO.DirectoryInfo> AcceptExistingOnly(this Option<System.IO.DirectoryInfo> option)
-    public static Option<System.IO.FileSystemInfo> AcceptExistingOnly(this Option<System.IO.FileSystemInfo> option)
-    public static Option<T> AcceptExistingOnly<T>(this Option<T> option)
-  public class ParseResult
-    public System.CommandLine.Invocation.CommandLineAction Action { get; }
-    public System.CommandLine.Parsing.CommandResult CommandResult { get; }
-    public CommandLineConfiguration Configuration { get; }
-    public System.Collections.Generic.IReadOnlyList<System.CommandLine.Parsing.ParseError> Errors { get; }
-    public System.CommandLine.Parsing.CommandResult RootCommandResult { get; }
-    public System.Collections.Generic.IReadOnlyList<System.CommandLine.Parsing.Token> Tokens { get; }
-    public System.Collections.Generic.IReadOnlyList<System.String> UnmatchedTokens { get; }
-    public System.CommandLine.Completions.CompletionContext GetCompletionContext()
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.Nullable<System.Int32> position = null)
-    public T GetRequiredValue<T>(Argument<T> argument)
-    public T GetRequiredValue<T>(Option<T> option)
-    public T GetRequiredValue<T>(System.String name)
-    public System.CommandLine.Parsing.ArgumentResult GetResult(Argument argument)
-    public System.CommandLine.Parsing.CommandResult GetResult(Command command)
-    public System.CommandLine.Parsing.OptionResult GetResult(Option option)
-    public System.CommandLine.Parsing.DirectiveResult GetResult(Directive directive)
-    public System.CommandLine.Parsing.SymbolResult GetResult(Symbol symbol)
-    public System.CommandLine.Parsing.SymbolResult GetResult(System.String name)
-    public T GetValue<T>(Argument<T> argument)
-    public T GetValue<T>(Option<T> option)
-    public T GetValue<T>(System.String name)
-    public System.Int32 Invoke()
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.Threading.CancellationToken cancellationToken = null)
-    public System.String ToString()
-  public class RootCommand : Command, System.Collections.IEnumerable
-    public static System.String ExecutableName { get; }
-    public static System.String ExecutablePath { get; }
-    .ctor(System.String description = )
-    public System.Collections.Generic.IList<Directive> Directives { get; }
-    public System.Void Add(Directive directive)
-  public abstract class Symbol
-    public System.String Description { get; set; }
-    public System.Boolean Hidden { get; set; }
-    public System.String Name { get; }
-    public System.Collections.Generic.IEnumerable<Symbol> Parents { get; }
-    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
-    public System.String ToString()
-  public class VersionOption : Option
-    .ctor()
-    .ctor(System.String name, System.String[] aliases)
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Type ValueType { get; }
-System.CommandLine.Completions
-  public class CompletionContext
-    public static CompletionContext Empty { get; }
-    public System.CommandLine.ParseResult ParseResult { get; }
-    public System.String WordToComplete { get; }
-  public class CompletionItem, System.IEquatable<CompletionItem>
-    .ctor(System.String label, System.String kind = Value, System.String sortText = null, System.String insertText = null, System.String documentation = null, System.String detail = null)
-    public System.String Detail { get; }
-    public System.String Documentation { get; set; }
-    public System.String InsertText { get; }
-    public System.String Kind { get; }
-    public System.String Label { get; }
-    public System.String SortText { get; }
-    public System.Boolean Equals(CompletionItem other)
-    public System.Boolean Equals(System.Object obj)
-    public System.Int32 GetHashCode()
-    public System.String ToString()
-  public class SuggestDirective : System.CommandLine.Directive
-    .ctor()
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-  public class TextCompletionContext : CompletionContext
-    public System.String CommandLineText { get; }
-    public System.Int32 CursorPosition { get; }
-    public TextCompletionContext AtCursorPosition(System.Int32 position)
-System.CommandLine.Help
-  public class HelpAction : System.CommandLine.Invocation.SynchronousCommandLineAction
-    .ctor()
-    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
-  public class HelpOption : System.CommandLine.Option
-    .ctor()
-    .ctor(System.String name, System.String[] aliases)
-    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
-    public System.Type ValueType { get; }
-System.CommandLine.Invocation
-  public abstract class AsynchronousCommandLineAction : CommandLineAction
-    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.ParseResult parseResult, System.Threading.CancellationToken cancellationToken = null)
-  public abstract class CommandLineAction
-    public System.Boolean Terminating { get; }
-    protected System.Void set_Terminating(System.Boolean value)
-  public class ParseErrorAction : SynchronousCommandLineAction
-    .ctor()
-    public System.Boolean ShowHelp { get; set; }
-    public System.Boolean ShowTypoCorrections { get; set; }
-    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
-  public abstract class SynchronousCommandLineAction : CommandLineAction
-    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
-System.CommandLine.Parsing
-  public class ArgumentResult : SymbolResult
-    public System.CommandLine.Argument Argument { get; }
-    public System.Void AddError(System.String errorMessage)
-    public T GetValueOrDefault<T>()
-    public System.Void OnlyTake(System.Int32 numberOfTokens)
-    public System.String ToString()
-  public static class CommandLineParser
-    public static System.CommandLine.ParseResult Parse(System.CommandLine.Command command, System.Collections.Generic.IReadOnlyList<System.String> args, System.CommandLine.CommandLineConfiguration configuration = null)
-    public static System.CommandLine.ParseResult Parse(System.CommandLine.Command command, System.String commandLine, System.CommandLine.CommandLineConfiguration configuration = null)
-    public static System.Collections.Generic.IEnumerable<System.String> SplitCommandLine(System.String commandLine)
-  public class CommandResult : SymbolResult
-    public System.Collections.Generic.IEnumerable<SymbolResult> Children { get; }
-    public System.CommandLine.Command Command { get; }
-    public Token IdentifierToken { get; }
-    public System.String ToString()
-  public class DirectiveResult : SymbolResult
-    public System.CommandLine.Directive Directive { get; }
-    public Token Token { get; }
-    public System.Collections.Generic.IReadOnlyList<System.String> Values { get; }
-  public class OptionResult : SymbolResult
-    public Token IdentifierToken { get; }
-    public System.Int32 IdentifierTokenCount { get; }
-    public System.Boolean Implicit { get; }
-    public System.CommandLine.Option Option { get; }
-    public T GetValueOrDefault<T>()
-    public System.String ToString()
-  public class ParseError
-    public System.String Message { get; }
-    public SymbolResult SymbolResult { get; }
-    public System.String ToString()
-  public abstract class SymbolResult
-    public System.Collections.Generic.IEnumerable<ParseError> Errors { get; }
-    public SymbolResult Parent { get; }
-    public System.Collections.Generic.IReadOnlyList<Token> Tokens { get; }
-    public System.Void AddError(System.String errorMessage)
-    public T GetRequiredValue<T>(Argument<T> argument)
-    public T GetRequiredValue<T>(Option<T> option)
-    public T GetRequiredValue<T>(System.String name)
-    public ArgumentResult GetResult(System.CommandLine.Argument argument)
-    public CommandResult GetResult(System.CommandLine.Command command)
-    public OptionResult GetResult(System.CommandLine.Option option)
-    public DirectiveResult GetResult(System.CommandLine.Directive directive)
-    public SymbolResult GetResult(System.String name)
-    public T GetValue<T>(Argument<T> argument)
-    public T GetValue<T>(Option<T> option)
-    public T GetValue<T>(System.String name)
-  public class Token, System.IEquatable<Token>
-    public static System.Boolean op_Equality(Token left, Token right)
-    public static System.Boolean op_Inequality(Token left, Token right)
-    .ctor(System.String value, TokenType type, System.CommandLine.Symbol symbol)
-    public TokenType Type { get; }
-    public System.String Value { get; }
-    public System.Boolean Equals(System.Object obj)
-    public System.Boolean Equals(Token other)
-    public System.Int32 GetHashCode()
-    public System.String ToString()
-  public enum TokenType : System.Enum, System.IComparable, System.IConvertible, System.IFormattable, System.ISpanFormattable
-    Argument=0
-    Command=1
-    Option=2
-    DoubleDash=3
-    Directive=4
-  public delegate TryReplaceToken : System.MulticastDelegate, System.ICloneable, System.Runtime.Serialization.ISerializable
-    .ctor(System.Object object, System.IntPtr method)
-    public System.IAsyncResult BeginInvoke(System.String tokenToReplace, ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage, System.AsyncCallback callback, System.Object object)
-    public System.Boolean EndInvoke(ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage, System.IAsyncResult result)
-    public System.Boolean Invoke(System.String tokenToReplace, ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage)
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
similarity index 61%
rename from src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs
rename to src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
index 0e0a21633c..aa70d10f8e 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityApprovalTests.cs
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
@@ -1,19 +1,19 @@
 // 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)
+            .UniqueForTargetFrameworkAndVersion();
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
index 6f1488383c..58540aaf4f 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
+++ b/src/System.CommandLine.ApiCompatibility.Tests/System.CommandLine.ApiCompatibility.Tests.csproj
@@ -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>
diff --git a/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs b/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs
deleted file mode 100644
index bbf662f44f..0000000000
--- a/src/System.CommandLine.Tests/Help/ApprovalTests.Config.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using ApprovalTests.Reporters;
-using ApprovalTests.Reporters.TestFrameworks;
-
-// Use globally defined Reporter for ApprovalTests. Please see
-// https://github.com/approvals/ApprovalTests.Net/blob/master/docs/ApprovalTests/Reporters.md
-
-[assembly: UseReporter(typeof(FrameworkAssertReporter))]
-[assembly: ApprovalTests.Namers.UseApprovalSubdirectory("Approvals")]
diff --git a/src/System.CommandLine.Tests/Help/Approvals/HelpBuilderTests.Help_layout_has_not_changed.approved.txt b/src/System.CommandLine.Tests/Help/Approvals/HelpBuilderTests.Help_layout_has_not_changed.approved.txt
deleted file mode 100644
index 79cc177654..0000000000
--- a/src/System.CommandLine.Tests/Help/Approvals/HelpBuilderTests.Help_layout_has_not_changed.approved.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Description:
-  Test description
-
-Usage:
-  the-root-command <the-root-arg-no-description-no-default> [<the-root-arg-no-description-default> <the-root-arg-no-default> [<the-root-arg> [<the-root-arg-enum-default>]]] [options]
-
-Arguments:
-  <the-root-arg-no-description-no-default>
-  <the-root-arg-no-description-default>     [default: the-root-arg-no-description-default-value]
-  <the-root-arg-no-default>                 the-root-arg-no-default-description
-  <the-root-arg>                            the-root-arg-description [default: the-root-arg-one-value]
-  <Read|ReadWrite|Write>                    the-root-arg-enum-default-description [default: Read]
-
-Options:
-  -trna, --the-root-option-no-arg (REQUIRED)                                                 the-root-option-no-arg-description
-  -trondda, --the-root-option-no-description-default-arg                                     [default: the-root-option--no-description-default-arg-value]
-  -tronda, --the-root-option-no-default-arg <the-root-option-arg-no-default-arg> (REQUIRED)  the-root-option-no-default-description
-  -troda, --the-root-option-default-arg <the-root-option-arg>                                the-root-option-default-arg-description [default: the-root-option-arg-value]
-  -troea, --the-root-option-enum-arg <Read|ReadWrite|Write>                                  the-root-option-description [default: Read]
-  -trorea, --the-root-option-required-enum-arg <Read|ReadWrite|Write> (REQUIRED)             the-root-option-description [default: Read]
-  -tromld, --the-root-option-multi-line-description                                          the-root-option
-                                                                                             multi-line
-                                                                                             description
-
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
index 0cb2b097ce..93c65dd8cf 100644
--- a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Approval.cs
+++ b/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());
         }
     }
 }
diff --git a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj b/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
index a7695f0dc7..9a80b58f57 100644
--- a/src/System.CommandLine.Tests/System.CommandLine.Tests.csproj
+++ b/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'">
diff --git a/src/System.CommandLine.Tests/VerifyChecksTests.cs b/src/System.CommandLine.Tests/VerifyChecksTests.cs
new file mode 100644
index 0000000000..a1c46bd0d7
--- /dev/null
+++ b/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();
+}
\ No newline at end of file

From 966482c157686643f5cad091bbc9692c1c9a7345 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sat, 5 Jul 2025 21:05:32 +1000
Subject: [PATCH 2/3] Update Directory.Packages.props

---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6f89d9b4b0..9a7e0b1d0f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -21,7 +21,7 @@
   <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.3" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.1" />
+    <PackageVersion Include="xunit" Version="$(XUnitVersion)" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="$(XUnitRunnerVisualStudioVersion)" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 025495b497fa14cf9f52d150137f3c9457e85d88 Mon Sep 17 00:00:00 2001
From: Simon Cropp <simon.cropp@gmail.com>
Date: Sun, 6 Jul 2025 10:13:59 +1000
Subject: [PATCH 3/3] fix ignore

---
 .gitignore                                    |   2 +-
 ...ommandLine_api_is_not_changed.verified.txt | 274 ++++++++++++++++++
 .../ApiCompatibilityTests.cs                  |   3 +-
 ...s.Help_layout_has_not_changed.verified.txt |  24 ++
 4 files changed, 300 insertions(+), 3 deletions(-)
 create mode 100644 src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.System_CommandLine_api_is_not_changed.verified.txt
 create mode 100644 src/System.CommandLine.Tests/Help/HelpBuilderTests.Help_layout_has_not_changed.verified.txt

diff --git a/.gitignore b/.gitignore
index 5fc7e75fe9..8d561842af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,4 +154,4 @@ TestResults/
 .ionide
 
 # Verify
-*.verified.txt
+*.received.txt
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.System_CommandLine_api_is_not_changed.verified.txt b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.System_CommandLine_api_is_not_changed.verified.txt
new file mode 100644
index 0000000000..45cc9f778a
--- /dev/null
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.System_CommandLine_api_is_not_changed.verified.txt
@@ -0,0 +1,274 @@
+System.CommandLine
+  public abstract class Argument : Symbol
+    public ArgumentArity Arity { get; set; }
+    public System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> CompletionSources { get; }
+    public System.Boolean HasDefaultValue { get; }
+    public System.String HelpName { get; set; }
+    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.ArgumentResult>> Validators { get; }
+    public System.Type ValueType { get; }
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
+    public System.Object GetDefaultValue()
+    public System.String ToString()
+  public class Argument<T> : Argument
+    .ctor(System.String name)
+    public Func<System.CommandLine.Parsing.ArgumentResult,T> CustomParser { get; set; }
+    public Func<System.CommandLine.Parsing.ArgumentResult,T> DefaultValueFactory { get; set; }
+    public System.Boolean HasDefaultValue { get; }
+    public System.Type ValueType { get; }
+  public struct ArgumentArity : System.ValueType, System.IEquatable<ArgumentArity>
+    public static ArgumentArity ExactlyOne { get; }
+    public static ArgumentArity OneOrMore { get; }
+    public static ArgumentArity Zero { get; }
+    public static ArgumentArity ZeroOrMore { get; }
+    public static ArgumentArity ZeroOrOne { get; }
+    .ctor(System.Int32 minimumNumberOfValues, System.Int32 maximumNumberOfValues)
+    public System.Int32 MaximumNumberOfValues { get; }
+    public System.Int32 MinimumNumberOfValues { get; }
+    public System.Boolean Equals(ArgumentArity other)
+    public System.Boolean Equals(System.Object obj)
+    public System.Int32 GetHashCode()
+  public static class ArgumentValidation
+    public static Argument<System.IO.FileInfo> AcceptExistingOnly(this Argument<System.IO.FileInfo> argument)
+    public static Argument<System.IO.DirectoryInfo> AcceptExistingOnly(this Argument<System.IO.DirectoryInfo> argument)
+    public static Argument<System.IO.FileSystemInfo> AcceptExistingOnly(this Argument<System.IO.FileSystemInfo> argument)
+    public static Argument<T> AcceptExistingOnly<T>(this Argument<T> argument)
+    public static Argument<T> AcceptLegalFileNamesOnly<T>(this Argument<T> argument)
+    public static Argument<T> AcceptLegalFilePathsOnly<T>(this Argument<T> argument)
+    public static Argument<T> AcceptOnlyFromAmong<T>(this Argument<T> argument, System.String[] values)
+  public class Command : Symbol, System.Collections.IEnumerable
+    .ctor(System.String name, System.String description = null)
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Collections.Generic.ICollection<System.String> Aliases { get; }
+    public System.Collections.Generic.IList<Argument> Arguments { get; }
+    public System.Collections.Generic.IEnumerable<Symbol> Children { get; }
+    public System.Collections.Generic.IList<Option> Options { get; }
+    public System.Collections.Generic.IList<Command> Subcommands { get; }
+    public System.Boolean TreatUnmatchedTokensAsErrors { get; set; }
+    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.CommandResult>> Validators { get; }
+    public System.Void Add(Argument argument)
+    public System.Void Add(Option option)
+    public System.Void Add(Command command)
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
+    public ParseResult Parse(System.Collections.Generic.IReadOnlyList<System.String> args, CommandLineConfiguration configuration = null)
+    public ParseResult Parse(System.String commandLine, CommandLineConfiguration configuration = null)
+    public System.Void SetAction(System.Action<ParseResult> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Int32> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Threading.Tasks.Task> action)
+    public System.Void SetAction(System.Func<ParseResult,System.Threading.CancellationToken,System.Threading.Tasks.Task<System.Int32>> action)
+  public class CommandLineConfiguration
+    .ctor(Command rootCommand)
+    public System.Boolean EnableDefaultExceptionHandler { get; set; }
+    public System.Boolean EnablePosixBundling { get; set; }
+    public System.IO.TextWriter Error { get; set; }
+    public System.IO.TextWriter Output { get; set; }
+    public System.Nullable<System.TimeSpan> ProcessTerminationTimeout { get; set; }
+    public System.CommandLine.Parsing.TryReplaceToken ResponseFileTokenReplacer { get; set; }
+    public Command RootCommand { get; }
+    public System.Int32 Invoke(System.String commandLine)
+    public System.Int32 Invoke(System.String[] args)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.String commandLine, System.Threading.CancellationToken cancellationToken = null)
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.String[] args, System.Threading.CancellationToken cancellationToken = null)
+    public ParseResult Parse(System.Collections.Generic.IReadOnlyList<System.String> args)
+    public ParseResult Parse(System.String commandLine)
+    public System.Void ThrowIfInvalid()
+  public class CommandLineConfigurationException : System.Exception, System.Runtime.Serialization.ISerializable
+    .ctor(System.String message)
+  public static class CompletionSourceExtensions
+    public static System.Void Add(this System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> completionSources, System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.String>> completionsDelegate)
+    public static System.Void Add(this System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> completionSources, System.String[] completions)
+  public class DiagramDirective : Directive
+    .ctor()
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Int32 ParseErrorReturnValue { get; set; }
+  public class Directive : Symbol
+    .ctor(System.String name)
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
+  public class EnvironmentVariablesDirective : Directive
+    .ctor()
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+  public abstract class Option : Symbol
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Collections.Generic.ICollection<System.String> Aliases { get; }
+    public System.Boolean AllowMultipleArgumentsPerToken { get; set; }
+    public ArgumentArity Arity { get; set; }
+    public System.Collections.Generic.List<System.Func<System.CommandLine.Completions.CompletionContext,System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem>>> CompletionSources { get; }
+    public System.Boolean HasDefaultValue { get; }
+    public System.String HelpName { get; set; }
+    public System.Boolean Recursive { get; set; }
+    public System.Boolean Required { get; set; }
+    public System.Collections.Generic.List<System.Action<System.CommandLine.Parsing.OptionResult>> Validators { get; }
+    public System.Type ValueType { get; }
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
+    public System.Object GetDefaultValue()
+  public class Option<T> : Option
+    .ctor(System.String name, System.String[] aliases)
+    public Func<System.CommandLine.Parsing.ArgumentResult,T> CustomParser { get; set; }
+    public Func<System.CommandLine.Parsing.ArgumentResult,T> DefaultValueFactory { get; set; }
+    public System.Type ValueType { get; }
+    public Option<T> AcceptLegalFileNamesOnly()
+    public Option<T> AcceptLegalFilePathsOnly()
+    public Option<T> AcceptOnlyFromAmong(System.String[] values)
+  public static class OptionValidation
+    public static Option<System.IO.FileInfo> AcceptExistingOnly(this Option<System.IO.FileInfo> option)
+    public static Option<System.IO.DirectoryInfo> AcceptExistingOnly(this Option<System.IO.DirectoryInfo> option)
+    public static Option<System.IO.FileSystemInfo> AcceptExistingOnly(this Option<System.IO.FileSystemInfo> option)
+    public static Option<T> AcceptExistingOnly<T>(this Option<T> option)
+  public class ParseResult
+    public System.CommandLine.Invocation.CommandLineAction Action { get; }
+    public System.CommandLine.Parsing.CommandResult CommandResult { get; }
+    public CommandLineConfiguration Configuration { get; }
+    public System.Collections.Generic.IReadOnlyList<System.CommandLine.Parsing.ParseError> Errors { get; }
+    public System.CommandLine.Parsing.CommandResult RootCommandResult { get; }
+    public System.Collections.Generic.IReadOnlyList<System.CommandLine.Parsing.Token> Tokens { get; }
+    public System.Collections.Generic.IReadOnlyList<System.String> UnmatchedTokens { get; }
+    public System.CommandLine.Completions.CompletionContext GetCompletionContext()
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.Nullable<System.Int32> position = null)
+    public T GetRequiredValue<T>(Argument<T> argument)
+    public T GetRequiredValue<T>(Option<T> option)
+    public T GetRequiredValue<T>(System.String name)
+    public System.CommandLine.Parsing.ArgumentResult GetResult(Argument argument)
+    public System.CommandLine.Parsing.CommandResult GetResult(Command command)
+    public System.CommandLine.Parsing.OptionResult GetResult(Option option)
+    public System.CommandLine.Parsing.DirectiveResult GetResult(Directive directive)
+    public System.CommandLine.Parsing.SymbolResult GetResult(Symbol symbol)
+    public System.CommandLine.Parsing.SymbolResult GetResult(System.String name)
+    public T GetValue<T>(Argument<T> argument)
+    public T GetValue<T>(Option<T> option)
+    public T GetValue<T>(System.String name)
+    public System.Int32 Invoke()
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.Threading.CancellationToken cancellationToken = null)
+    public System.String ToString()
+  public class RootCommand : Command, System.Collections.IEnumerable
+    public static System.String ExecutableName { get; }
+    public static System.String ExecutablePath { get; }
+    .ctor(System.String description = )
+    public System.Collections.Generic.IList<Directive> Directives { get; }
+    public System.Void Add(Directive directive)
+  public abstract class Symbol
+    public System.String Description { get; set; }
+    public System.Boolean Hidden { get; set; }
+    public System.String Name { get; }
+    public System.Collections.Generic.IEnumerable<Symbol> Parents { get; }
+    public System.Collections.Generic.IEnumerable<System.CommandLine.Completions.CompletionItem> GetCompletions(System.CommandLine.Completions.CompletionContext context)
+    public System.String ToString()
+  public class VersionOption : Option
+    .ctor()
+    .ctor(System.String name, System.String[] aliases)
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Type ValueType { get; }
+System.CommandLine.Completions
+  public class CompletionContext
+    public static CompletionContext Empty { get; }
+    public System.CommandLine.ParseResult ParseResult { get; }
+    public System.String WordToComplete { get; }
+  public class CompletionItem, System.IEquatable<CompletionItem>
+    .ctor(System.String label, System.String kind = Value, System.String sortText = null, System.String insertText = null, System.String documentation = null, System.String detail = null)
+    public System.String Detail { get; }
+    public System.String Documentation { get; set; }
+    public System.String InsertText { get; }
+    public System.String Kind { get; }
+    public System.String Label { get; }
+    public System.String SortText { get; }
+    public System.Boolean Equals(CompletionItem other)
+    public System.Boolean Equals(System.Object obj)
+    public System.Int32 GetHashCode()
+    public System.String ToString()
+  public class SuggestDirective : System.CommandLine.Directive
+    .ctor()
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+  public class TextCompletionContext : CompletionContext
+    public System.String CommandLineText { get; }
+    public System.Int32 CursorPosition { get; }
+    public TextCompletionContext AtCursorPosition(System.Int32 position)
+System.CommandLine.Help
+  public class HelpAction : System.CommandLine.Invocation.SynchronousCommandLineAction
+    .ctor()
+    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
+  public class HelpOption : System.CommandLine.Option
+    .ctor()
+    .ctor(System.String name, System.String[] aliases)
+    public System.CommandLine.Invocation.CommandLineAction Action { get; set; }
+    public System.Type ValueType { get; }
+System.CommandLine.Invocation
+  public abstract class AsynchronousCommandLineAction : CommandLineAction
+    public System.Threading.Tasks.Task<System.Int32> InvokeAsync(System.CommandLine.ParseResult parseResult, System.Threading.CancellationToken cancellationToken = null)
+  public abstract class CommandLineAction
+    public System.Boolean Terminating { get; }
+    protected System.Void set_Terminating(System.Boolean value)
+  public class ParseErrorAction : SynchronousCommandLineAction
+    .ctor()
+    public System.Boolean ShowHelp { get; set; }
+    public System.Boolean ShowTypoCorrections { get; set; }
+    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
+  public abstract class SynchronousCommandLineAction : CommandLineAction
+    public System.Int32 Invoke(System.CommandLine.ParseResult parseResult)
+System.CommandLine.Parsing
+  public class ArgumentResult : SymbolResult
+    public System.CommandLine.Argument Argument { get; }
+    public System.Void AddError(System.String errorMessage)
+    public T GetValueOrDefault<T>()
+    public System.Void OnlyTake(System.Int32 numberOfTokens)
+    public System.String ToString()
+  public static class CommandLineParser
+    public static System.CommandLine.ParseResult Parse(System.CommandLine.Command command, System.Collections.Generic.IReadOnlyList<System.String> args, System.CommandLine.CommandLineConfiguration configuration = null)
+    public static System.CommandLine.ParseResult Parse(System.CommandLine.Command command, System.String commandLine, System.CommandLine.CommandLineConfiguration configuration = null)
+    public static System.Collections.Generic.IEnumerable<System.String> SplitCommandLine(System.String commandLine)
+  public class CommandResult : SymbolResult
+    public System.Collections.Generic.IEnumerable<SymbolResult> Children { get; }
+    public System.CommandLine.Command Command { get; }
+    public Token IdentifierToken { get; }
+    public System.String ToString()
+  public class DirectiveResult : SymbolResult
+    public System.CommandLine.Directive Directive { get; }
+    public Token Token { get; }
+    public System.Collections.Generic.IReadOnlyList<System.String> Values { get; }
+  public class OptionResult : SymbolResult
+    public Token IdentifierToken { get; }
+    public System.Int32 IdentifierTokenCount { get; }
+    public System.Boolean Implicit { get; }
+    public System.CommandLine.Option Option { get; }
+    public T GetValueOrDefault<T>()
+    public System.String ToString()
+  public class ParseError
+    public System.String Message { get; }
+    public SymbolResult SymbolResult { get; }
+    public System.String ToString()
+  public abstract class SymbolResult
+    public System.Collections.Generic.IEnumerable<ParseError> Errors { get; }
+    public SymbolResult Parent { get; }
+    public System.Collections.Generic.IReadOnlyList<Token> Tokens { get; }
+    public System.Void AddError(System.String errorMessage)
+    public T GetRequiredValue<T>(Argument<T> argument)
+    public T GetRequiredValue<T>(Option<T> option)
+    public T GetRequiredValue<T>(System.String name)
+    public ArgumentResult GetResult(System.CommandLine.Argument argument)
+    public CommandResult GetResult(System.CommandLine.Command command)
+    public OptionResult GetResult(System.CommandLine.Option option)
+    public DirectiveResult GetResult(System.CommandLine.Directive directive)
+    public SymbolResult GetResult(System.String name)
+    public T GetValue<T>(Argument<T> argument)
+    public T GetValue<T>(Option<T> option)
+    public T GetValue<T>(System.String name)
+  public class Token, System.IEquatable<Token>
+    public static System.Boolean op_Equality(Token left, Token right)
+    public static System.Boolean op_Inequality(Token left, Token right)
+    .ctor(System.String value, TokenType type, System.CommandLine.Symbol symbol)
+    public TokenType Type { get; }
+    public System.String Value { get; }
+    public System.Boolean Equals(System.Object obj)
+    public System.Boolean Equals(Token other)
+    public System.Int32 GetHashCode()
+    public System.String ToString()
+  public enum TokenType : System.Enum, System.IComparable, System.IConvertible, System.IFormattable, System.ISpanFormattable
+    Argument=0
+    Command=1
+    Option=2
+    DoubleDash=3
+    Directive=4
+  public delegate TryReplaceToken : System.MulticastDelegate, System.ICloneable, System.Runtime.Serialization.ISerializable
+    .ctor(System.Object object, System.IntPtr method)
+    public System.IAsyncResult BeginInvoke(System.String tokenToReplace, ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage, System.AsyncCallback callback, System.Object object)
+    public System.Boolean EndInvoke(ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage, System.IAsyncResult result)
+    public System.Boolean Invoke(System.String tokenToReplace, ref System.Collections.Generic.IReadOnlyList<System.String> replacementTokens, ref System.String& errorMessage)
diff --git a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
index aa70d10f8e..4f2a1a6337 100644
--- a/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
+++ b/src/System.CommandLine.ApiCompatibility.Tests/ApiCompatibilityTests.cs
@@ -13,7 +13,6 @@ public class ApiCompatibilityTests
     public Task System_CommandLine_api_is_not_changed()
     {
         var contract = ApiContract.GenerateContractForAssembly(typeof(ParseResult).Assembly);
-        return Verifier.Verify(contract)
-            .UniqueForTargetFrameworkAndVersion();
+        return Verifier.Verify(contract);
     }
 }
\ No newline at end of file
diff --git a/src/System.CommandLine.Tests/Help/HelpBuilderTests.Help_layout_has_not_changed.verified.txt b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Help_layout_has_not_changed.verified.txt
new file mode 100644
index 0000000000..79cc177654
--- /dev/null
+++ b/src/System.CommandLine.Tests/Help/HelpBuilderTests.Help_layout_has_not_changed.verified.txt
@@ -0,0 +1,24 @@
+Description:
+  Test description
+
+Usage:
+  the-root-command <the-root-arg-no-description-no-default> [<the-root-arg-no-description-default> <the-root-arg-no-default> [<the-root-arg> [<the-root-arg-enum-default>]]] [options]
+
+Arguments:
+  <the-root-arg-no-description-no-default>
+  <the-root-arg-no-description-default>     [default: the-root-arg-no-description-default-value]
+  <the-root-arg-no-default>                 the-root-arg-no-default-description
+  <the-root-arg>                            the-root-arg-description [default: the-root-arg-one-value]
+  <Read|ReadWrite|Write>                    the-root-arg-enum-default-description [default: Read]
+
+Options:
+  -trna, --the-root-option-no-arg (REQUIRED)                                                 the-root-option-no-arg-description
+  -trondda, --the-root-option-no-description-default-arg                                     [default: the-root-option--no-description-default-arg-value]
+  -tronda, --the-root-option-no-default-arg <the-root-option-arg-no-default-arg> (REQUIRED)  the-root-option-no-default-description
+  -troda, --the-root-option-default-arg <the-root-option-arg>                                the-root-option-default-arg-description [default: the-root-option-arg-value]
+  -troea, --the-root-option-enum-arg <Read|ReadWrite|Write>                                  the-root-option-description [default: Read]
+  -trorea, --the-root-option-required-enum-arg <Read|ReadWrite|Write> (REQUIRED)             the-root-option-description [default: Read]
+  -tromld, --the-root-option-multi-line-description                                          the-root-option
+                                                                                             multi-line
+                                                                                             description
+