stop using System.CommandLine types that aren't public anymore

eng/Versions.props

@@ -63,8 +63,8 @@
     <SystemDataSqlClientPackageVersion>4.8.6</SystemDataSqlClientPackageVersion>
     <StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
     <WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
-    <SystemCommandLineVersion>2.0.0-beta5.25265.101</SystemCommandLineVersion>
-    <SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25227.101</SystemCommandLineNamingConventionBinderVersion>
+    <SystemCommandLineVersion>2.0.0-beta5.25279.2</SystemCommandLineVersion>
+    <SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
     <MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
     <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>

src/Cli/Microsoft.TemplateEngine.Cli/ChoiceTemplateParameter.cs

@@ -2,10 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.CommandLine.Help;
 using System.CommandLine.Parsing;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.Commands;
+using Microsoft.TemplateEngine.Cli.Help;
 using Microsoft.TemplateEngine.Utils;
 
 namespace Microsoft.TemplateEngine.Cli

src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateParameter.cs

@@ -2,12 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.CommandLine.Help;
 using System.CommandLine.Parsing;
 using System.Diagnostics;
 using System.Globalization;
 using Microsoft.TemplateEngine.Abstractions;
 using Microsoft.TemplateEngine.Cli.Commands;
+using Microsoft.TemplateEngine.Cli.Help;
 
 namespace Microsoft.TemplateEngine.Cli
 {

src/Cli/Microsoft.TemplateEngine.Cli/Commands/ICustomHelp.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.CommandLine.Help;
+using Microsoft.TemplateEngine.Cli.Help;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {

src/Cli/Microsoft.TemplateEngine.Cli/Commands/NewCommand.Help.cs

@@ -1,8 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.CommandLine.Help;
 using Microsoft.TemplateEngine.Abstractions;
+using Microsoft.TemplateEngine.Cli.Help;
 
 namespace Microsoft.TemplateEngine.Cli.Commands
 {

src/Cli/Microsoft.TemplateEngine.Cli/Commands/create/InstantiateCommand.Help.cs

@@ -2,11 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.CommandLine;
-using System.CommandLine.Help;
 using System.Diagnostics.CodeAnalysis;
-using System.Resources;
 using Microsoft.DotNet.Cli.Utils;
 using Microsoft.TemplateEngine.Abstractions;
+using Microsoft.TemplateEngine.Cli.Help;
 using Microsoft.TemplateEngine.Edge.Settings;
 using Microsoft.TemplateEngine.Utils;
 using Command = System.CommandLine.Command;
@@ -16,8 +15,6 @@ namespace Microsoft.TemplateEngine.Cli.Commands
     internal partial class InstantiateCommand
     {
         private const string Indent = "  ";
-        private static Lazy<ResourceManager> _resourceManager = new(
-            () => new ResourceManager("System.CommandLine.Properties.Resources", typeof(System.CommandLine.Symbol).Assembly));
 
         public static void WriteHelp(HelpContext context, InstantiateCommandArgs instantiateCommandArgs, IEngineEnvironmentSettings environmentSettings)
         {
@@ -328,7 +325,7 @@ internal static void ShowCommandOptions(
                 cliOption.EnsureHelpName();
             }
 
-            context.Output.WriteLine(HelpOptionsTitle());
+            context.Output.WriteLine(LocalizationResources.HelpOptionsTitle());
             IEnumerable<TwoColumnHelpRow> optionsToWrite = optionsToShow.Select(o => context.HelpBuilder.GetTwoColumnRow(o, context));
             context.HelpBuilder.WriteColumns(optionsToWrite.ToArray(), context);
             context.Output.WriteLine();
@@ -381,14 +378,14 @@ internal static void ShowUsage(Command? command, IReadOnlyList<string> shortName
             }
 
             usageParts.Reverse();
-            context.Output.WriteLine(HelpUsageTitle());
+            context.Output.WriteLine(LocalizationResources.HelpUsageTitle());
             foreach (string shortName in shortNames)
             {
                 IEnumerable<string> parts = usageParts.Concat(
                     new[]
                     {
                         shortName,
-                        HelpUsageOptions(),
+                        LocalizationResources.HelpUsageOptions(),
                         HelpStrings.Text_UsageTemplateOptionsPart
                     });
                 context.Output.WriteLine(Indent + string.Join(" ", parts));
@@ -463,7 +460,7 @@ private static void WriteCustomInstantiateHelp(HelpContext context, Command comm
 
         private static void CustomUsageSection(HelpContext context, Command command)
         {
-            context.Output.WriteLine(HelpUsageTitle());
+            context.Output.WriteLine(LocalizationResources.HelpUsageTitle());
             context.Output.WriteLine(Indent + string.Join(" ", GetCustomUsageParts(context, command, showSubcommands: false)));
 
             if (command is NewCommand)
@@ -499,21 +496,13 @@ private static IEnumerable<string> GetCustomUsageParts(
 
             if (showSubcommands)
             {
-                yield return HelpUsageCommand();
+                yield return LocalizationResources.HelpUsageCommand();
             }
 
             if (showOptions)
             {
-                yield return HelpUsageOptions();
+                yield return LocalizationResources.HelpUsageOptions();
             }
         }
-
-        private static string HelpUsageOptions() => _resourceManager.Value.GetString("HelpUsageOptions")!;
-
-        private static string HelpUsageCommand() => _resourceManager.Value.GetString("HelpUsageCommand")!;
-
-        private static string HelpUsageTitle() => _resourceManager.Value.GetString("HelpUsageTitle")!;
-
-        private static string HelpOptionsTitle() => _resourceManager.Value.GetString("HelpOptionsTitle")!;
     }
 }

src/Cli/Microsoft.TemplateEngine.Cli/Help/DotnetHelpAction.cs

@@ -0,0 +1,41 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.CommandLine;
+using System.CommandLine.Invocation;
+
+namespace Microsoft.TemplateEngine.Cli.Help
+{
+    /// <summary>
+    /// Provides command line help.
+    /// </summary>
+    public sealed class DotnetHelpAction : SynchronousCommandLineAction
+    {
+        private HelpBuilder? _builder;
+
+        /// <summary>
+        /// Specifies an <see cref="Builder"/> to be used to format help output when help is requested.
+        /// </summary>
+        public HelpBuilder Builder
+        {
+            get => _builder ??= new HelpBuilder(Console.IsOutputRedirected ? int.MaxValue : Console.WindowWidth);
+            set => _builder = value ?? throw new ArgumentNullException(nameof(value));
+        }
+
+        /// <inheritdoc />
+        public override int Invoke(ParseResult parseResult)
+        {
+            var output = parseResult.Configuration.Output;
+
+            var helpContext = new HelpContext(
+                Builder,
+                parseResult.CommandResult.Command,
+                output,
+                parseResult);
+
+            Builder.Write(helpContext);
+
+            return 0;
+        }
+    }
+}