[xbuild] LogExtensions.LogError - disambiguate.

* LogExtensions.cs(LogError): Rename the 'filename' overload to ..
(LogErrorWithFilename): .. this.
* Engine.cs: Track api changes.

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
index 5674cbaed389b987e995f3a36f728710844ed049..47b5ffddffd0e5213883adcdeb7ff3040db9727c 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs
@@ -235,11 +235,11 @@ namespace Microsoft.Build.BuildEngine {
                                result = BuildProjectFileInternal (projectFile, targetNames, globalProperties, targetOutputs, buildFlags, toolsVersion);
                                return result;
                        } catch (InvalidProjectFileException ie) {
-                               this.LogError (projectFile, ie.Message);
+                               this.LogErrorWithFilename (projectFile, ie.Message);
                                this.LogMessage (MessageImportance.Low, String.Format ("{0}: {1}", projectFile, ie.ToString ()));
                                return false;
                        } catch (Exception e) {
-                               this.LogError (projectFile, e.Message);
+                               this.LogErrorWithFilename (projectFile, e.Message);
                                this.LogMessage (MessageImportance.Low, String.Format ("{0}: {1}", projectFile, e.ToString ()));
                                return false;
                        } finally {

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/LogExtensions.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/LogExtensions.cs
index e83e82c880cc87d81d07f2f5dcd6141752bfdaa1..7577a6ede35d72f731b0dfc7805792a3e5b9b194 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/LogExtensions.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/LogExtensions.cs
@@ -51,10 +51,10 @@ namespace Microsoft.Build.BuildEngine
                public static void LogError (this Engine engine, string message,
                                     params object[] messageArgs)
                {
-                       engine.LogError (null, message, messageArgs);
+                       engine.LogErrorWithFilename (null, message, messageArgs);
                }
 
-               public static void LogError (this Engine engine, string filename, string message,
+               public static void LogErrorWithFilename (this Engine engine, string filename, string message,
                                     params object[] messageArgs)
                {
                        if (message == null)