Add support for Verbose in MsbuildMessageListener.
Sean Hall committed
May 8, 2020 at 21:54 UTC
d840580127d99bf817332711f8a9c833f395d387
1 file changed
+17
-12
src/WixToolset.BuildTasks/DoIt.cs
+17
-12
@@ -253,27 +253,32 @@ namespace WixToolset.BuildTasks
253
254
public void Write(Message message)
255
{
256
+ var code = this.ShortAppName + message.Id.ToString();
257
+ var file = message.SourceLineNumbers?.FileName ?? this.LongAppName;
258
+ var lineNumber = message.SourceLineNumbers?.LineNumber ?? 0;
259
switch (message.Level)
260
{
261
case MessageLevel.Error:
259
- this.Logger.LogError(null, this.ShortAppName + message.Id.ToString(), null, message.SourceLineNumbers?.FileName ?? this.LongAppName, message.SourceLineNumbers?.LineNumber ?? 0, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
262
+ this.Logger.LogError(null, code, null, file, lineNumber, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
263
+ break;
264
+
265
+ case MessageLevel.Verbose:
266
+ this.Logger.LogMessage(null, code, null, file, lineNumber, 0, 0, 0, MessageImportance.Low, message.ResourceNameOrFormat, message.MessageArgs);
267
break;
268
269
case MessageLevel.Warning:
263
- this.Logger.LogWarning(null, this.ShortAppName + message.Id.ToString(), null, message.SourceLineNumbers?.FileName ?? this.LongAppName, message.SourceLineNumbers?.LineNumber ?? 0, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
270
+ this.Logger.LogWarning(null, code, null, file, lineNumber, 0, 0, 0, message.ResourceNameOrFormat, message.MessageArgs);
271
break;
272
273
default:
267
- // TODO: Revisit this because something is going horribly awry. The commented out LogMessage call is crashing saying that the "message" parameter is null. When you look at the call stack, the code
268
- // is in the wrong LogMessage override and the "null" subcategory was passed in as the message. Not clear why it is picking the wrong overload.
269
- //if (message.Id > 0)
270
- //{
271
- // this.Logger.LogMessage(null, code, null, message.SourceLineNumber?.FileName, message.SourceLineNumber?.LineNumber ?? 0, 0, 0, 0, MessageImportance.Normal, message.Format, message.FormatData);
272
- //}
273
- //else
274
- //{
275
- this.Logger.LogMessage(MessageImportance.Normal, message.ResourceNameOrFormat, message.MessageArgs);
276
- //}
274
+ if (message.Id > 0)
275
+ {
276
+ this.Logger.LogMessage(null, code, null, file, lineNumber, 0, 0, 0, MessageImportance.Normal, message.ResourceNameOrFormat, message.MessageArgs);
277
+ }
278
+ else
279
+ {
280
+ this.Logger.LogMessage(MessageImportance.Normal, message.ResourceNameOrFormat, message.MessageArgs);
281
+ }
282
break;
283
}
284
}