From: Ankit Jain <radical@corewars.org>
Date: Sun, 27 Feb 2011 19:09:55 +0000 (+0530)
Subject: [xbuild] Add missing property to Error/Warning tasks.
X-Git-Url: http://wien.tomnetworks.com/gitweb/?p=mono.git;a=commitdiff_plain;h=78a9231511e1d2b60df9499a2db7fb4ce0fcbed4

[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 c3e0d3e8ad6..f3234ead195 100644
--- 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 ebe1b2da27b..a200efd9c85 100644
--- 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; }
 	}
 }