From 011e428880d14afd4811a02f07e56af5876f9583 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 24 Jul 2020 10:06:33 +0100 Subject: [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. --- src/WixToolset.Core/AppCommon.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Core/AppCommon.cs b/src/WixToolset.Core/AppCommon.cs index 3ea09f08..7f54b057 100644 --- a/src/WixToolset.Core/AppCommon.cs +++ b/src/WixToolset.Core/AppCommon.cs @@ -28,7 +28,8 @@ namespace WixToolset.Core public static void DisplayToolHeader() { var assembly = Assembly.GetCallingAssembly(); - Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]\r\n[AssemblyCopyright]", assembly)); + Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [FileVersion]", assembly)); + Console.WriteLine(WixDistribution.ReplacePlaceholders("[AssemblyCopyright]", assembly)); } /// @@ -37,7 +38,8 @@ namespace WixToolset.Core public static void DisplayToolFooter() { var assembly = Assembly.GetCallingAssembly(); - Console.Write(WixDistribution.ReplacePlaceholders("\r\nFor more information see: [SupportUrl]", assembly)); + Console.WriteLine(); + Console.WriteLine(WixDistribution.ReplacePlaceholders("For more information see: [SupportUrl]", assembly)); } } } -- cgit v1.2.3-55-g6feb