[Linux] Fix newline handling in help message.
The current help message for `wix` itself doesn't end in a newline. On Windows that's only a minor oddity because command prompts are typically preceded by a newline anyway; on Linux, they're typically not, so it's much more unfriendly to leave the shell prompt at the end of a line. Also, generating newlines using Console.WriteLine instead of an explicit `\r\n` means they automatically adapt to the local platform's newline convention.
Simon Tatham committed
Jul 24, 2020 at 10:06 UTC
011e428880d14afd4811a02f07e56af5876f9583
1 file changed
+4
-2
src/WixToolset.Core/AppCommon.cs
+4
-2
@@ -28,7 +28,8 @@ namespace WixToolset.Core
28
public static void DisplayToolHeader()
29
{
30
var assembly = Assembly.GetCallingAssembly();
31
- Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]\r\n[AssemblyCopyright]", assembly));
31
+ Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]", assembly));
32
+ Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyCopyright]", assembly));
33
}
34
35
/// <summary>
@@ -37,7 +38,8 @@ namespace WixToolset.Core
38
public static void DisplayToolFooter()
39
{
40
var assembly = Assembly.GetCallingAssembly();
40
- Console.Write(WixDistribution.ReplacePlaceholders("\r\nFor more information see: [SupportUrl]", assembly));
41
+ Console.WriteLine();
42
+ Console.WriteLine(WixDistribution.ReplacePlaceholders("For more information see: [SupportUrl]", assembly));
43
}
44
}
45
}