diff options
Diffstat (limited to 'src/WixToolset.Core/CommandLine/CommandLine.cs')
| -rw-r--r-- | src/WixToolset.Core/CommandLine/CommandLine.cs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/WixToolset.Core/CommandLine/CommandLine.cs b/src/WixToolset.Core/CommandLine/CommandLine.cs index 0c21eaaa..7371628b 100644 --- a/src/WixToolset.Core/CommandLine/CommandLine.cs +++ b/src/WixToolset.Core/CommandLine/CommandLine.cs | |||
| @@ -55,7 +55,9 @@ namespace WixToolset.Core.CommandLine | |||
| 55 | 55 | ||
| 56 | if (command.ShowLogo) | 56 | if (command.ShowLogo) |
| 57 | { | 57 | { |
| 58 | AppCommon.DisplayToolHeader(); | 58 | var branding = this.ServiceProvider.GetService<IWixBranding>(); |
| 59 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]")); | ||
| 60 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyCopyright]")); | ||
| 59 | } | 61 | } |
| 60 | 62 | ||
| 61 | return command; | 63 | return command; |
| @@ -73,6 +75,7 @@ namespace WixToolset.Core.CommandLine | |||
| 73 | 75 | ||
| 74 | private ICommandLineCommand Parse(ICommandLineContext context) | 76 | private ICommandLineCommand Parse(ICommandLineContext context) |
| 75 | { | 77 | { |
| 78 | var branding = context.ServiceProvider.GetService<IWixBranding>(); | ||
| 76 | var extensions = context.ExtensionManager.GetServices<IExtensionCommandLine>(); | 79 | var extensions = context.ExtensionManager.GetServices<IExtensionCommandLine>(); |
| 77 | 80 | ||
| 78 | foreach (var extension in extensions) | 81 | foreach (var extension in extensions) |
| @@ -118,7 +121,7 @@ namespace WixToolset.Core.CommandLine | |||
| 118 | extension.PostParse(); | 121 | extension.PostParse(); |
| 119 | } | 122 | } |
| 120 | 123 | ||
| 121 | return command ?? new HelpCommand(extensions); | 124 | return command ?? new HelpCommand(extensions, branding); |
| 122 | } | 125 | } |
| 123 | 126 | ||
| 124 | private bool TryParseCommand(string arg, ICommandLineParser parser, IEnumerable<IExtensionCommandLine> extensions, out ICommandLineCommand command) | 127 | private bool TryParseCommand(string arg, ICommandLineParser parser, IEnumerable<IExtensionCommandLine> extensions, out ICommandLineCommand command) |
| @@ -134,7 +137,8 @@ namespace WixToolset.Core.CommandLine | |||
| 134 | case "h": | 137 | case "h": |
| 135 | case "help": | 138 | case "help": |
| 136 | case "-help": | 139 | case "-help": |
| 137 | command = new HelpCommand(extensions); | 140 | var branding = this.ServiceProvider.GetService<IWixBranding>(); |
| 141 | command = new HelpCommand(extensions, branding); | ||
| 138 | break; | 142 | break; |
| 139 | 143 | ||
| 140 | case "version": | 144 | case "version": |
