Merge pull request #926 from ermshiperete/novell-bug-674098

[mono.git] / mcs / class / Microsoft.Build / Microsoft.Build.Evaluation / Project.cs

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
index 2c460bd8016850d84a81b526d70df5cc31bf3378..4f7fbd168ce50eaec7965274a649ac78f697af20 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
@@ -428,17 +428,12 @@ namespace Microsoft.Build.Evaluation
                
                bool Evaluate (string unexpandedValue)
                {
-                       return string.IsNullOrWhiteSpace (unexpandedValue) || new ExpressionEvaluator (this, null).EvaluateAsBoolean (unexpandedValue);
+                       return string.IsNullOrWhiteSpace (unexpandedValue) || new ExpressionEvaluator (this).EvaluateAsBoolean (unexpandedValue);
                }
 
                public string ExpandString (string unexpandedValue)
                {
-                       return ExpandString (unexpandedValue, null);
-               }
-               
-               string ExpandString (string unexpandedValue, string replacementForMissingStuff)
-               {
-                       return WindowsCompatibilityExtensions.NormalizeFilePath (new ExpressionEvaluator (this, replacementForMissingStuff).Evaluate (unexpandedValue));
+                       return WindowsCompatibilityExtensions.NormalizeFilePath (new ExpressionEvaluator (this).Evaluate (unexpandedValue));
                }
 
                public static string GetEvaluatedItemIncludeEscaped (ProjectItem item)