diff options
Diffstat (limited to 'src/tools/heat/HeatCommand.cs')
-rw-r--r-- | src/tools/heat/HeatCommand.cs | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/tools/heat/HeatCommand.cs b/src/tools/heat/HeatCommand.cs index 56277004..6815acd6 100644 --- a/src/tools/heat/HeatCommand.cs +++ b/src/tools/heat/HeatCommand.cs | |||
@@ -11,13 +11,16 @@ namespace WixToolset.Harvesters | |||
11 | using System.Threading.Tasks; | 11 | using System.Threading.Tasks; |
12 | using System.Xml; | 12 | using System.Xml; |
13 | using WixToolset.Data; | 13 | using WixToolset.Data; |
14 | using WixToolset.Extensibility; | ||
14 | using WixToolset.Extensibility.Data; | 15 | using WixToolset.Extensibility.Data; |
15 | using WixToolset.Extensibility.Services; | 16 | using WixToolset.Extensibility.Services; |
16 | using WixToolset.Harvesters.Extensibility; | 17 | using WixToolset.Harvesters.Extensibility; |
17 | using Wix = WixToolset.Harvesters.Serialize; | 18 | using Wix = WixToolset.Harvesters.Serialize; |
18 | 19 | ||
19 | internal class HeatCommand : ICommandLineCommand | 20 | internal class HeatCommand : BaseCommandLineCommand |
20 | { | 21 | { |
22 | private bool showLogo; | ||
23 | |||
21 | public HeatCommand(string harvestType, IList<IHeatExtension> extensions, IServiceProvider serviceProvider) | 24 | public HeatCommand(string harvestType, IList<IHeatExtension> extensions, IServiceProvider serviceProvider) |
22 | { | 25 | { |
23 | this.Extensions = extensions; | 26 | this.Extensions = extensions; |
@@ -28,11 +31,7 @@ namespace WixToolset.Harvesters | |||
28 | this.ExtensionOptions.Add(harvestType); | 31 | this.ExtensionOptions.Add(harvestType); |
29 | } | 32 | } |
30 | 33 | ||
31 | public bool ShowHelp { get; set; } | 34 | public override bool ShowLogo => this.showLogo; |
32 | |||
33 | public bool ShowLogo { get; set; } | ||
34 | |||
35 | public bool StopParsing { get; private set; } | ||
36 | 35 | ||
37 | private string ExtensionArgument { get; set; } | 36 | private string ExtensionArgument { get; set; } |
38 | 37 | ||
@@ -50,13 +49,18 @@ namespace WixToolset.Harvesters | |||
50 | 49 | ||
51 | private IServiceProvider ServiceProvider { get; } | 50 | private IServiceProvider ServiceProvider { get; } |
52 | 51 | ||
53 | public Task<int> ExecuteAsync(CancellationToken cancellationToken) | 52 | public override CommandLineHelp GetCommandLineHelp() |
53 | { | ||
54 | return null; | ||
55 | } | ||
56 | |||
57 | public override Task<int> ExecuteAsync(CancellationToken cancellationToken) | ||
54 | { | 58 | { |
55 | var exitCode = this.Harvest(); | 59 | var exitCode = this.Harvest(); |
56 | return Task.FromResult(exitCode); | 60 | return Task.FromResult(exitCode); |
57 | } | 61 | } |
58 | 62 | ||
59 | public bool TryParseArgument(ICommandLineParser parser, string arg) | 63 | public override bool TryParseArgument(ICommandLineParser parser, string arg) |
60 | { | 64 | { |
61 | if (this.ExtensionArgument == null) | 65 | if (this.ExtensionArgument == null) |
62 | { | 66 | { |
@@ -67,7 +71,7 @@ namespace WixToolset.Harvesters | |||
67 | string parameter = arg.Substring(1); | 71 | string parameter = arg.Substring(1); |
68 | if ("nologo" == parameter) | 72 | if ("nologo" == parameter) |
69 | { | 73 | { |
70 | this.ShowLogo = false; | 74 | this.showLogo = false; |
71 | } | 75 | } |
72 | else if ("o" == parameter || "out" == parameter) | 76 | else if ("o" == parameter || "out" == parameter) |
73 | { | 77 | { |