diff options
Diffstat (limited to 'src')
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 | |||
| 56 | if (command.ShowLogo) | 56 | if (command.ShowLogo) |
| 57 | { | 57 | { |
| 58 | var branding = this.ServiceProvider.GetService<IWixBranding>(); | 58 | var branding = this.ServiceProvider.GetService<IWixBranding>(); |
| 59 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]")); | 59 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [ProductVersion]")); |
| 60 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyCopyright]")); | 60 | Console.WriteLine(branding.ReplacePlaceholders("[AssemblyCopyright]")); |
| 61 | } | 61 | } |
| 62 | 62 | ||
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 | |||
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | Console.WriteLine(); | 56 | Console.WriteLine(); |
| 57 | Console.WriteLine("Run 'wix [command] --help' for more information on a command."); | 57 | Console.WriteLine("Run 'wix [command] -h[elp]' for more information on a command."); |
| 58 | Console.WriteLine(); | 58 | Console.WriteLine(); |
| 59 | Console.WriteLine(this.Branding.ReplacePlaceholders("For more information see: [SupportUrl]")); | 59 | Console.WriteLine(this.Branding.ReplacePlaceholders("For more information see: [SupportUrl]")); |
| 60 | 60 | ||
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 | |||
| 22 | , ThisAssembly.Git.BaseVersion.Patch | 22 | , ThisAssembly.Git.BaseVersion.Patch |
| 23 | , ThisAssembly.Git.SemVer.DashLabel | 23 | , ThisAssembly.Git.SemVer.DashLabel |
| 24 | , ThisAssembly.Git.Commit); | 24 | , ThisAssembly.Git.Commit); |
| 25 | |||
| 26 | return Task.FromResult(0); | 25 | return Task.FromResult(0); |
| 27 | } | 26 | } |
| 28 | 27 | ||
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 | |||
| 61 | 61 | ||
| 62 | original = original.Replace("[FileCopyright]", commonFileVersion.LegalCopyright); | 62 | original = original.Replace("[FileCopyright]", commonFileVersion.LegalCopyright); |
| 63 | original = original.Replace("[FileVersion]", commonFileVersion.FileVersion); | 63 | original = original.Replace("[FileVersion]", commonFileVersion.FileVersion); |
| 64 | original = original.Replace("[ProductVersion]", commonFileVersion.ProductVersion); | ||
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | var fileVersion = FileVersionInfo.GetVersionInfo(assembly.Location); | 67 | var fileVersion = FileVersionInfo.GetVersionInfo(assembly.Location); |
| @@ -69,6 +70,7 @@ namespace WixToolset.Core.ExtensibilityServices | |||
| 69 | original = original.Replace("[FileCopyright]", fileVersion.LegalCopyright); | 70 | original = original.Replace("[FileCopyright]", fileVersion.LegalCopyright); |
| 70 | original = original.Replace("[FileProductName]", fileVersion.ProductName); | 71 | original = original.Replace("[FileProductName]", fileVersion.ProductName); |
| 71 | original = original.Replace("[FileVersion]", fileVersion.FileVersion); | 72 | original = original.Replace("[FileVersion]", fileVersion.FileVersion); |
| 73 | original = original.Replace("[ProductVersion]", fileVersion.ProductVersion); | ||
| 72 | 74 | ||
| 73 | if (original.Contains("[FileVersionMajorMinor]")) | 75 | if (original.Contains("[FileVersionMajorMinor]")) |
| 74 | { | 76 | { |
