Revert "Update to the latest dotnet/command-line-api version (#94746)" (#94878)

MiYanni · web-flow · commit 14e0038d33df · 2023-11-17T12:21:18.000-06:00
This reverts commit fe3abf5.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -80,13 +80,13 @@
       <Uri>https://github.com/dotnet/llvm-project</Uri>
       <Sha>4db411bed3b4f48dfb4ed59629a0dc1d23e724e6</Sha>
     </Dependency>
-    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23407.1">
+    <Dependency Name="System.CommandLine" Version="2.0.0-beta4.23307.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
+      <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.440701">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.command-line-api" Version="0.1.430701">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
-      <Sha>a045dd54a4c44723c215d992288160eb1401bb7f</Sha>
+      <Sha>02fe27cd6a9b001c8feb7938e6ef4b3799745759b</Sha>
       <SourceBuild RepoName="command-line-api" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23509.2">
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -161,7 +161,7 @@
     <optimizationPGOCoreCLRVersion>1.0.0-prerelease.23559.3</optimizationPGOCoreCLRVersion>
     <!-- Not auto-updated. -->
     <MicrosoftDiaSymReaderNativeVersion>16.11.29-beta1.23404.4</MicrosoftDiaSymReaderNativeVersion>
-    <SystemCommandLineVersion>2.0.0-beta4.23407.1</SystemCommandLineVersion>
+    <SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
     <TraceEventVersion>3.0.3</TraceEventVersion>
     <NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
     <NetStandardLibraryVersion>2.0.3</NetStandardLibraryVersion>
diff --git a/src/coreclr/tools/Common/CommandLineHelpers.cs b/src/coreclr/tools/Common/CommandLineHelpers.cs
@@ -127,7 +127,7 @@ public static CliRootCommand UseVersion(this CliRootCommand command)
             return command;
         }
 
-        public static CliRootCommand UseExtendedHelp(this CliRootCommand command, Func<HelpContext, IEnumerable<Func<HelpContext, bool>>> customizer)
+        public static CliRootCommand UseExtendedHelp(this CliRootCommand command, Func<HelpContext, IEnumerable<Action<HelpContext>>> customizer)
         {
             foreach (CliOption option in command.Options)
             {
diff --git a/src/coreclr/tools/ILVerify/Program.cs b/src/coreclr/tools/ILVerify/Program.cs
@@ -481,7 +481,8 @@ public PEReader Resolve(string simpleName)
         private static int Main(string[] args) =>
             new CliConfiguration(new ILVerifyRootCommand().UseVersion())
             {
-                ResponseFileTokenReplacer = Helpers.TryReadResponseFile
+                ResponseFileTokenReplacer = Helpers.TryReadResponseFile,
+                EnableParseErrorReporting = true
             }.Invoke(args);
     }
 }
diff --git a/src/coreclr/tools/aot/ILCompiler/ILCompilerRootCommand.cs b/src/coreclr/tools/aot/ILCompiler/ILCompilerRootCommand.cs
@@ -298,9 +298,9 @@ public ILCompilerRootCommand(string[] args) : base(".NET Native IL Compiler")
             });
         }
 
-        public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _)
+        public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext _)
         {
-            foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())
+            foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())
                 yield return sectionDelegate;
 
             yield return _ =>
@@ -354,7 +354,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _
                 Console.WriteLine();
                 Console.WriteLine("The following CPU names are predefined groups of instruction sets and can be used in --instruction-set too:");
                 Console.WriteLine(string.Join(", ", Internal.JitInterface.InstructionSetFlags.AllCpuNames));
-                return true;
             };
         }
 
diff --git a/src/coreclr/tools/aot/ILCompiler/Program.cs b/src/coreclr/tools/aot/ILCompiler/Program.cs
@@ -738,7 +738,8 @@ private static int Main(string[] args) =>
                 .UseVersion()
                 .UseExtendedHelp(ILCompilerRootCommand.GetExtendedHelp))
             {
-                ResponseFileTokenReplacer = Helpers.TryReadResponseFile
+                ResponseFileTokenReplacer = Helpers.TryReadResponseFile,
+                EnableParseErrorReporting = true
             }.Invoke(args);
     }
 }
diff --git a/src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs b/src/coreclr/tools/aot/crossgen2/Crossgen2RootCommand.cs
@@ -282,9 +282,9 @@ public Crossgen2RootCommand(string[] args) : base(SR.Crossgen2BannerText)
             });
         }
 
-        public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _)
+        public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext _)
         {
-            foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())
+            foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())
                 yield return sectionDelegate;
 
             yield return _ =>
@@ -343,7 +343,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _
                 Console.WriteLine();
                 Console.WriteLine(SR.CpuFamilies);
                 Console.WriteLine(string.Join(", ", Internal.JitInterface.InstructionSetFlags.AllCpuNames));
-                return true;
             };
         }
 
diff --git a/src/coreclr/tools/aot/crossgen2/Program.cs b/src/coreclr/tools/aot/crossgen2/Program.cs
@@ -915,7 +915,8 @@ private static int Main(string[] args) =>
                 .UseVersion()
                 .UseExtendedHelp(Crossgen2RootCommand.GetExtendedHelp))
             {
-                ResponseFileTokenReplacer = Helpers.TryReadResponseFile
+                ResponseFileTokenReplacer = Helpers.TryReadResponseFile,
+                EnableParseErrorReporting = true
             }.Invoke(args);
     }
 }
diff --git a/src/coreclr/tools/dotnet-pgo/PgoRootCommand.cs b/src/coreclr/tools/dotnet-pgo/PgoRootCommand.cs
@@ -260,9 +260,9 @@ int ExecuteWithContext(ParseResult result, bool setVerbosity)
             }
         }
 
-        public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext context)
+        public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext context)
         {
-            foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())
+            foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())
                 yield return sectionDelegate;
 
             if (context.Command.Name == "create-mibc" || context.Command.Name == "create-jittrace")
@@ -280,7 +280,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext c
 ""perfview collect -LogFile:logOfCollection.txt -DataFile:jittrace.etl -Zip:false -merge:false -providers:Microsoft-Windows-DotNETRuntime:0x1E000080018:4""
 - Capture Jit and R2R events via perfview of all processes running using ETW tracing
 ");
-                    return true;
                 };
             }
         }
diff --git a/src/coreclr/tools/dotnet-pgo/Program.cs b/src/coreclr/tools/dotnet-pgo/Program.cs
@@ -165,7 +165,8 @@ private static int Main(string[] args) =>
                 .UseVersion()
                 .UseExtendedHelp(PgoRootCommand.GetExtendedHelp))
             {
-                ResponseFileTokenReplacer = Helpers.TryReadResponseFile
+                ResponseFileTokenReplacer = Helpers.TryReadResponseFile,
+                EnableParseErrorReporting = true
             }.Invoke(args);
 
         public static void PrintWarning(string warning)
diff --git a/src/coreclr/tools/r2rdump/Program.cs b/src/coreclr/tools/r2rdump/Program.cs
@@ -500,7 +500,8 @@ public int Run()
         public static int Main(string[] args) =>
             new CliConfiguration(new R2RDumpRootCommand().UseVersion())
             {
-                ResponseFileTokenReplacer = Helpers.TryReadResponseFile
+                ResponseFileTokenReplacer = Helpers.TryReadResponseFile,
+                EnableParseErrorReporting = true
             }.Invoke(args);
     }
 }
diff --git a/src/coreclr/tools/r2rtest/CommandLineOptions.cs b/src/coreclr/tools/r2rtest/CommandLineOptions.cs
@@ -299,7 +299,10 @@ void CreateCommand(string name, string description, CliOption[] options, Func<Bu
             new CliOption<DirectoryInfo>("--asp-net-path", "-asp") { Description = "Path to SERP's ASP.NET Core folder" }.AcceptExistingOnly();
 
         private static int Main(string[] args) =>
-            new CliConfiguration(new R2RTestRootCommand().UseVersion()).Invoke(args);
+            new CliConfiguration(new R2RTestRootCommand().UseVersion())
+            {
+                EnableParseErrorReporting = true
+            }.Invoke(args);
     }
 
     public partial class BuildOptions

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public static CliRootCommand UseVersion(this CliRootCommand command)`
`127`	`127`	`return command;`
`128`	`128`	`}`
`129`	`129`
`130`		`- public static CliRootCommand UseExtendedHelp(this CliRootCommand command, Func<HelpContext, IEnumerable<Func<HelpContext, bool>>> customizer)`
	`130`	`+ public static CliRootCommand UseExtendedHelp(this CliRootCommand command, Func<HelpContext, IEnumerable<Action<HelpContext>>> customizer)`
`131`	`131`	`{`
`132`	`132`	`foreach (CliOption option in command.Options)`
`133`	`133`	`{`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,8 @@ public PEReader Resolve(string simpleName)`
`481`	`481`	`private static int Main(string[] args) =>`
`482`	`482`	`new CliConfiguration(new ILVerifyRootCommand().UseVersion())`
`483`	`483`	`{`
`484`		`- ResponseFileTokenReplacer = Helpers.TryReadResponseFile`
	`484`	`+ ResponseFileTokenReplacer = Helpers.TryReadResponseFile,`
	`485`	`+ EnableParseErrorReporting = true`
`485`	`486`	`}.Invoke(args);`
`486`	`487`	`}`
`487`	`488`	`}`
Original file line number	Diff line number	Diff line change
`@@ -298,9 +298,9 @@ public ILCompilerRootCommand(string[] args) : base(".NET Native IL Compiler")`
`298`	`298`	`});`
`299`	`299`	`}`
`300`	`300`
`301`		`- public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _)`
	`301`	`+ public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext _)`
`302`	`302`	`{`
`303`		`- foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())`
	`303`	`+ foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())`
`304`	`304`	`yield return sectionDelegate;`
`305`	`305`
`306`	`306`	`yield return _ =>`
`@@ -354,7 +354,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _`
`354`	`354`	`Console.WriteLine();`
`355`	`355`	`Console.WriteLine("The following CPU names are predefined groups of instruction sets and can be used in --instruction-set too:");`
`356`	`356`	`Console.WriteLine(string.Join(", ", Internal.JitInterface.InstructionSetFlags.AllCpuNames));`
`357`		`- return true;`
`358`	`357`	`};`
`359`	`358`	`}`
`360`	`359`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,8 @@ private static int Main(string[] args) =>`
`738`	`738`	`.UseVersion()`
`739`	`739`	`.UseExtendedHelp(ILCompilerRootCommand.GetExtendedHelp))`
`740`	`740`	`{`
`741`		`- ResponseFileTokenReplacer = Helpers.TryReadResponseFile`
	`741`	`+ ResponseFileTokenReplacer = Helpers.TryReadResponseFile,`
	`742`	`+ EnableParseErrorReporting = true`
`742`	`743`	`}.Invoke(args);`
`743`	`744`	`}`
`744`	`745`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,9 +282,9 @@ public Crossgen2RootCommand(string[] args) : base(SR.Crossgen2BannerText)`
`282`	`282`	`});`
`283`	`283`	`}`
`284`	`284`
`285`		`- public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _)`
	`285`	`+ public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext _)`
`286`	`286`	`{`
`287`		`- foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())`
	`287`	`+ foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())`
`288`	`288`	`yield return sectionDelegate;`
`289`	`289`
`290`	`290`	`yield return _ =>`
`@@ -343,7 +343,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext _`
`343`	`343`	`Console.WriteLine();`
`344`	`344`	`Console.WriteLine(SR.CpuFamilies);`
`345`	`345`	`Console.WriteLine(string.Join(", ", Internal.JitInterface.InstructionSetFlags.AllCpuNames));`
`346`		`- return true;`
`347`	`346`	`};`
`348`	`347`	`}`
`349`	`348`
Original file line number	Diff line number	Diff line change
`@@ -915,7 +915,8 @@ private static int Main(string[] args) =>`
`915`	`915`	`.UseVersion()`
`916`	`916`	`.UseExtendedHelp(Crossgen2RootCommand.GetExtendedHelp))`
`917`	`917`	`{`
`918`		`- ResponseFileTokenReplacer = Helpers.TryReadResponseFile`
	`918`	`+ ResponseFileTokenReplacer = Helpers.TryReadResponseFile,`
	`919`	`+ EnableParseErrorReporting = true`
`919`	`920`	`}.Invoke(args);`
`920`	`921`	`}`
`921`	`922`	`}`
Original file line number	Diff line number	Diff line change
`@@ -260,9 +260,9 @@ int ExecuteWithContext(ParseResult result, bool setVerbosity)`
`260`	`260`	`}`
`261`	`261`	`}`
`262`	`262`
`263`		`- public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext context)`
	`263`	`+ public static IEnumerable<Action<HelpContext>> GetExtendedHelp(HelpContext context)`
`264`	`264`	`{`
`265`		`- foreach (Func<HelpContext, bool> sectionDelegate in HelpBuilder.Default.GetLayout())`
	`265`	`+ foreach (Action<HelpContext> sectionDelegate in HelpBuilder.Default.GetLayout())`
`266`	`266`	`yield return sectionDelegate;`
`267`	`267`
`268`	`268`	`if (context.Command.Name == "create-mibc" \|\| context.Command.Name == "create-jittrace")`
`@@ -280,7 +280,6 @@ public static IEnumerable<Func<HelpContext, bool>> GetExtendedHelp(HelpContext c`
`280`	`280`	`""perfview collect -LogFile:logOfCollection.txt -DataFile:jittrace.etl -Zip:false -merge:false -providers:Microsoft-Windows-DotNETRuntime:0x1E000080018:4""`
`281`	`281`	`- Capture Jit and R2R events via perfview of all processes running using ETW tracing`
`282`	`282`	`");`
`283`		`- return true;`
`284`	`283`	`};`
`285`	`284`	`}`
`286`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ private static int Main(string[] args) =>`
`165`	`165`	`.UseVersion()`
`166`	`166`	`.UseExtendedHelp(PgoRootCommand.GetExtendedHelp))`
`167`	`167`	`{`
`168`		`- ResponseFileTokenReplacer = Helpers.TryReadResponseFile`
	`168`	`+ ResponseFileTokenReplacer = Helpers.TryReadResponseFile,`
	`169`	`+ EnableParseErrorReporting = true`
`169`	`170`	`}.Invoke(args);`
`170`	`171`
`171`	`172`	`public static void PrintWarning(string warning)`