diff options
-rw-r--r-- | src/wix/ConsoleMessageListener.cs | 10 | ||||
-rw-r--r-- | src/wix/Program.cs | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/wix/ConsoleMessageListener.cs b/src/wix/ConsoleMessageListener.cs index 709fb576..ebf1622b 100644 --- a/src/wix/ConsoleMessageListener.cs +++ b/src/wix/ConsoleMessageListener.cs | |||
@@ -4,7 +4,6 @@ namespace WixToolset.Tools.Core | |||
4 | { | 4 | { |
5 | using System; | 5 | using System; |
6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
7 | using System.Linq; | ||
8 | using System.Globalization; | 7 | using System.Globalization; |
9 | using System.Text; | 8 | using System.Text; |
10 | using System.Threading; | 9 | using System.Threading; |
@@ -40,10 +39,8 @@ namespace WixToolset.Tools.Core | |||
40 | output.WriteLine("{0} : {1} {2}{3:0000}: {4}", filename, type, this.Prefix, message.Id, message.ToString()); | 39 | output.WriteLine("{0} : {1} {2}{3:0000}: {4}", filename, type, this.Prefix, message.Id, message.ToString()); |
41 | 40 | ||
42 | var fileNames = GetFileNames(message.SourceLineNumbers); | 41 | var fileNames = GetFileNames(message.SourceLineNumbers); |
43 | if (fileNames.Any()) | 42 | if (fileNames.Count > 1) |
44 | { | 43 | { |
45 | output.WriteLine("Source trace:"); | ||
46 | |||
47 | foreach (var fileName in fileNames) | 44 | foreach (var fileName in fileNames) |
48 | { | 45 | { |
49 | output.WriteLine("Source trace: {0}", fileName); | 46 | output.WriteLine("Source trace: {0}", fileName); |
@@ -51,10 +48,7 @@ namespace WixToolset.Tools.Core | |||
51 | } | 48 | } |
52 | } | 49 | } |
53 | 50 | ||
54 | public void Write(string message) | 51 | public void Write(string message) => Console.Out.WriteLine(message); |
55 | { | ||
56 | Console.Out.WriteLine(message); | ||
57 | } | ||
58 | 52 | ||
59 | public MessageLevel CalculateMessageLevel(IMessaging messaging, Message message, MessageLevel defaultMessageLevel) => defaultMessageLevel; | 53 | public MessageLevel CalculateMessageLevel(IMessaging messaging, Message message, MessageLevel defaultMessageLevel) => defaultMessageLevel; |
60 | 54 | ||
diff --git a/src/wix/Program.cs b/src/wix/Program.cs index df0e22e7..988d9036 100644 --- a/src/wix/Program.cs +++ b/src/wix/Program.cs | |||
@@ -13,7 +13,6 @@ namespace WixToolset.Tools | |||
13 | using WixToolset.Core.WindowsInstaller; | 13 | using WixToolset.Core.WindowsInstaller; |
14 | using WixToolset.Data; | 14 | using WixToolset.Data; |
15 | using WixToolset.Extensibility; | 15 | using WixToolset.Extensibility; |
16 | using WixToolset.Extensibility.Data; | ||
17 | using WixToolset.Extensibility.Services; | 16 | using WixToolset.Extensibility.Services; |
18 | using WixToolset.Tools.Core; | 17 | using WixToolset.Tools.Core; |
19 | 18 | ||