Skip to content

Commit c7cfe37

Browse files
ArtiomCiumacxoofx
authored andcommitted
[Toolkit.CompilerTask] Fixed message type reporting by msbuild task for parsed messages
1 parent d062e8a commit c7cfe37

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

Source/Toolkit/SharpDX.Toolkit.CompilerTask/ContentCompilerTask.cs

+20-18
Original file line numberDiff line numberDiff line change
@@ -106,15 +106,15 @@ private void LogSimpleMessage(LogMessage message)
106106
{
107107
switch (message.Type)
108108
{
109-
case LogMessageType.Warning:
110-
Log.LogWarning(message.Text);
111-
break;
112-
case LogMessageType.Error:
113-
Log.LogError(message.Text);
114-
break;
115-
case LogMessageType.Info:
116-
Log.LogMessage(MessageImportance.Low, message.Text);
117-
break;
109+
case LogMessageType.Warning:
110+
Log.LogWarning(message.Text);
111+
break;
112+
case LogMessageType.Error:
113+
Log.LogError(message.Text);
114+
break;
115+
case LogMessageType.Info:
116+
Log.LogMessage(MessageImportance.Low, message.Text);
117+
break;
118118
}
119119
}
120120

@@ -146,23 +146,25 @@ private void LogParsedMessage(LogMessage message)
146146
colEndNumber = colStartNumber;
147147
}
148148

149+
var msgType = match.Groups[4].Value;
149150
var msgCode = match.Groups[5].Value;
150151
var msgText = match.Groups[6].Value;
151152

152-
switch (message.Type)
153+
if (string.Compare(msgType, "error", StringComparison.InvariantCultureIgnoreCase) == 0)
153154
{
154-
case LogMessageType.Warning:
155155
Log.LogError(string.Empty, msgCode, string.Empty, filePath, lineNumber, colStartNumber, lineNumber, colEndNumber, msgText);
156-
break;
157-
case LogMessageType.Error:
156+
}
157+
else if (string.Compare(msgType, "warning", StringComparison.InvariantCultureIgnoreCase) == 0)
158+
{
158159
Log.LogWarning(string.Empty, msgCode, string.Empty, filePath, lineNumber, colStartNumber, lineNumber, colEndNumber, msgText);
159-
break;
160-
case LogMessageType.Info:
160+
}
161+
else if (string.Compare(msgType, "info", StringComparison.InvariantCultureIgnoreCase) == 0)
162+
{
161163
Log.LogWarning(string.Empty, msgCode, string.Empty, filePath, lineNumber, colStartNumber, lineNumber, colEndNumber, msgText);
162-
break;
163-
default:
164+
}
165+
else
166+
{
164167
Log.LogWarning(line);
165-
break;
166168
}
167169
}
168170
else

0 commit comments

Comments
 (0)