Add version info to help command

Output semver as the first line of the header


Moved version info to WixBranding


Additional separator


Remove alternate help command


Changed to use 'ProductVersion'


Updated VersionCommand to output semantic version in the same fashion as the logo


Remove whitespace
Revert version command to GitInfo


Revert all changes to the version command


Remove unused ServiceProvider from the version command

4 files changed, 4 insertions, 3 deletions

diff --git a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
index b87b6a5d..73a82dfc 100644
--- a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Core.CommandLine
             if (command.ShowLogo)
             {
                 var branding = this.ServiceProvider.GetService<IWixBranding>();
-                Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]"));
+                Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [ProductVersion]"));
                 Console.WriteLine(branding.ReplacePlaceholders("[AssemblyCopyright]"));
             }
 
diff --git a/src/wix/WixToolset.Core/CommandLine/HelpCommand.cs b/src/wix/WixToolset.Core/CommandLine/HelpCommand.cs
index 6a5ac183..4d192d43 100644
--- a/src/wix/WixToolset.Core/CommandLine/HelpCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/HelpCommand.cs
@@ -54,7 +54,7 @@ namespace WixToolset.Core.CommandLine
             }
 
             Console.WriteLine();
-            Console.WriteLine("Run 'wix [command] --help' for more information on a command.");
+            Console.WriteLine("Run 'wix [command] -h[elp]' for more information on a command.");
             Console.WriteLine();
             Console.WriteLine(this.Branding.ReplacePlaceholders("For more information see: [SupportUrl]"));
 
diff --git a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
index 057126d4..b9dacd3a 100644
--- a/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
+++ b/src/wix/WixToolset.Core/CommandLine/VersionCommand.cs
@@ -22,7 +22,6 @@ namespace WixToolset.Core.CommandLine
                                                   , ThisAssembly.Git.BaseVersion.Patch
                                                   , ThisAssembly.Git.SemVer.DashLabel
                                                   , ThisAssembly.Git.Commit);
-
             return Task.FromResult(0);
         }
 
diff --git a/src/wix/WixToolset.Core/ExtensibilityServices/WixBranding.cs b/src/wix/WixToolset.Core/ExtensibilityServices/WixBranding.cs
index 56300400..6114fc7c 100644
--- a/src/wix/WixToolset.Core/ExtensibilityServices/WixBranding.cs
+++ b/src/wix/WixToolset.Core/ExtensibilityServices/WixBranding.cs
@@ -61,6 +61,7 @@ namespace WixToolset.Core.ExtensibilityServices
 
                 original = original.Replace("[FileCopyright]", commonFileVersion.LegalCopyright);
                 original = original.Replace("[FileVersion]", commonFileVersion.FileVersion);
+                original = original.Replace("[ProductVersion]", commonFileVersion.ProductVersion);
             }
 
             var fileVersion = FileVersionInfo.GetVersionInfo(assembly.Location);
@@ -69,6 +70,7 @@ namespace WixToolset.Core.ExtensibilityServices
             original = original.Replace("[FileCopyright]", fileVersion.LegalCopyright);
             original = original.Replace("[FileProductName]", fileVersion.ProductName);
             original = original.Replace("[FileVersion]", fileVersion.FileVersion);
+            original = original.Replace("[ProductVersion]", fileVersion.ProductVersion);
 
             if (original.Contains("[FileVersionMajorMinor]"))
             {