Merge pull request #900 from Blewzman/FixAggregateExceptionGetBaseException

[mono.git] / mcs / class / Microsoft.Build.Utilities / Microsoft.Build.Utilities / ToolTask.cs

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 01a7c453aeca02c8be1da294dbd41d71dac98b60..ee7c37a3691958e16481e18132fabae1cbbea731 100644 (file)
--- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
+++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolTask.cs
@@ -72,7 +72,6 @@ namespace Microsoft.Build.Utilities
                {
                        this.TaskResources = taskResources;
                        this.HelpKeywordPrefix = helpKeywordPrefix;
-                       this.toolPath = MonoLocationHelper.GetBinDir ();
                        this.responseFileEncoding = Encoding.UTF8;
                        this.timeout = Int32.MaxValue;
                }
@@ -440,15 +439,12 @@ namespace Microsoft.Build.Utilities
                public virtual string ToolExe
                {
                        get {
-                               if (toolExe == null)
+                               if (string.IsNullOrEmpty (toolExe))
                                        return ToolName;
                                else
                                        return toolExe;
                        }
-                       set {
-                               if (!String.IsNullOrEmpty (value))
-                                       toolExe = value;
-                       }
+                       set { toolExe = value; }
                }
 
                protected abstract string ToolName
@@ -459,10 +455,7 @@ namespace Microsoft.Build.Utilities
                public string ToolPath
                {
                        get { return toolPath; }
-                       set {
-                               if (!String.IsNullOrEmpty (value))
-                                       toolPath  = value;
-                       }
+                       set { toolPath  = value; }
                }
 
                // Keep in sync with mcs/class/System/Microsoft.CSharp/CSharpCodeCompiler.cs