From a6f8b6fa3903d846cdc2fbe715ca951d83af3107 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Thu, 11 Aug 2022 17:40:06 -0700 Subject: Redesign command-line help to meet the needs of WiX v4 --- src/tools/heat/HelpCommand.cs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'src/tools/heat/HelpCommand.cs') diff --git a/src/tools/heat/HelpCommand.cs b/src/tools/heat/HelpCommand.cs index d991b4fa..25d8cd87 100644 --- a/src/tools/heat/HelpCommand.cs +++ b/src/tools/heat/HelpCommand.cs @@ -8,12 +8,13 @@ namespace WixToolset.Harvesters using System.Diagnostics; using System.Threading; using System.Threading.Tasks; + using WixToolset.Extensibility; using WixToolset.Extensibility.Data; using WixToolset.Extensibility.Services; using WixToolset.Harvesters.Data; using WixToolset.Harvesters.Extensibility; - internal class HelpCommand : ICommandLineCommand + internal class HelpCommand : BaseCommandLineCommand { const string HelpMessageOptionFormat = " {0,-7} {1}"; @@ -24,17 +25,12 @@ namespace WixToolset.Harvesters private IList Extensions { get; } - public bool ShowHelp { get; set; } - - public bool ShowLogo + public override CommandLineHelp GetCommandLineHelp() { - get => false; - set { } + return null; } - public bool StopParsing => true; - - public Task ExecuteAsync(CancellationToken cancellationToken) + public override Task ExecuteAsync(CancellationToken cancellationToken) { var exitCode = this.DisplayHelp(); return Task.FromResult(exitCode); @@ -50,8 +46,9 @@ namespace WixToolset.Harvesters Console.WriteLine(); } - public bool TryParseArgument(ICommandLineParser parser, string argument) + public override bool TryParseArgument(ICommandLineParser parser, string argument) { + this.StopParsing = true; return true; } -- cgit v1.2.3-55-g6feb