[xbuild] Add missing property to Error/Warning tasks.

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
index c3e0d3e8ad6d297db4405dbcc6692126f6a46f44..f3234ead1957cca54b488571ff84d468cf666e2c 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Error.cs
@@ -43,7 +43,8 @@ namespace Microsoft.Build.Tasks {
                public override bool Execute ()
                {
                        if (Log != null)
-                               Log.LogError (null, code, helpKeyword, BuildEngine.ProjectFileOfTaskNode,
+                               Log.LogError (null, code, helpKeyword,
+                                       String.IsNullOrEmpty (File) ? BuildEngine.ProjectFileOfTaskNode : File,
                                        BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                        BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                        text ?? String.Empty, null);
@@ -64,6 +65,8 @@ namespace Microsoft.Build.Tasks {
                        get { return text; }
                        set { text = value; }
                }
+
+               public string File { get; set; }
        }
 }
 

diff --git a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
index ebe1b2da27b69d2255b95c544da4be1f25ec8409..a200efd9c852f548f2455ebed1eb53d7d37eebc0 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
@@ -47,7 +47,8 @@ namespace Microsoft.Build.Tasks {
                        if (String.IsNullOrEmpty (text))
                                return true;
 
-                       Log.LogWarning (null, code, helpKeyword, BuildEngine.ProjectFileOfTaskNode,
+                       Log.LogWarning (null, code, helpKeyword,
+                               String.IsNullOrEmpty (File) ? BuildEngine.ProjectFileOfTaskNode : File,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                text, null);
@@ -68,6 +69,8 @@ namespace Microsoft.Build.Tasks {
                        get { return text; }
                        set { text = value; }
                }
+
+               public string File { get; set; }
        }
 }