* ToolTask.cs (ExecuteTool): Use the virtual method

Standard*LoggingImportance, instead of the underlying field.
(LogEventsFromTextOutput): Use @importance argument for LogMessage.
(LogToolCommand): Remove MonoTODO.

svn path=/trunk/mcs/; revision=151208

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
index 53abbf5d8a9e8981b9f1d4d0f610f1a8a31c447e..b729e53d451c6926b9426ca651c28020634bfafa 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Ankit Jain  <jankit@novell.com>
+
+       * ToolTask.cs (ExecuteTool): Use the virtual method
+       Standard*LoggingImportance, instead of the underlying field.
+       (LogEventsFromTextOutput): Use @importance argument for LogMessage.
+       (LogToolCommand): Remove MonoTODO.
+
 2010-02-06  Ankit Jain  <jankit@novell.com>
 
        * ToolTask.cs (SkipTaskExecution): Use ValidateParameters method.

diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
index 20fe64d3fc2ba8674c134958c57b2bff4e0daab8..eff4598c2688551494b167212a2def3cb5cf482f 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
@@ -166,8 +166,8 @@ namespace Microsoft.Build.Utilities
                                        return -1;
                                }
 
-                               ProcessOutputFile (output, standardOutputLoggingImportance);
-                               ProcessOutputFile (error, standardErrorLoggingImportance);
+                               ProcessOutputFile (output, StandardOutputLoggingImportance);
+                               ProcessOutputFile (error, StandardErrorLoggingImportance);
 
                                Log.LogMessage (MessageImportance.Low, "Tool {0} execution finished.", pathToTool);
                                return exitCode;
@@ -250,7 +250,7 @@ namespace Microsoft.Build.Utilities
                                Log.LogError (subcategory, code, null, filename, lineNumber, columnNumber, endLineNumber,
                                        endColumnNumber, text, null);
                        } else {
-                               Log.LogMessage (singleLine);
+                               Log.LogMessage (importance, singleLine);
                        }
                }
                
@@ -340,7 +340,6 @@ namespace Microsoft.Build.Utilities
                        return HostObjectInitializationStatus.NoActionReturnSuccess;
                }
 
-               [MonoTODO]
                protected virtual void LogToolCommand (string message)
                {
                        Log.LogMessage (MessageImportance.Normal, message);