Merge pull request #2670 from lambdageek/dev/monoerror-mono_runtime_object_init

[mono.git] / mcs / class / Microsoft.Build.Tasks / Microsoft.Build.Tasks / Warning.cs

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 74279dd2debb3df71ed2c78047b79502a4c25d03..ab21fae4dd936943cd3df5c9f5c734d68e9e0759 100644 (file)
--- a/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
+++ b/mcs/class/Microsoft.Build.Tasks/Microsoft.Build.Tasks/Warning.cs
@@ -25,7 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
 
 using System;
 using Microsoft.Build.Framework;
@@ -44,9 +43,11 @@ namespace Microsoft.Build.Tasks {
 
                public override bool Execute ()
                {
-                       if (text == null)
-                               text = String.Empty;
-                       Log.LogWarning (null, code, helpKeyword, BuildEngine.ProjectFileOfTaskNode,
+                       if (String.IsNullOrEmpty (text))
+                               return true;
+
+                       Log.LogWarning (null, code, helpKeyword,
+                               String.IsNullOrEmpty (File) ? BuildEngine.ProjectFileOfTaskNode : File,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                BuildEngine.LineNumberOfTaskNode, BuildEngine.ColumnNumberOfTaskNode,
                                text, null);
@@ -67,7 +68,8 @@ namespace Microsoft.Build.Tasks {
                        get { return text; }
                        set { text = value; }
                }
+
+               public string File { get; set; }
        }
 }
 
-#endif
\ No newline at end of file