Merge pull request #4453 from lambdageek/bug-49721

[mono.git] / mcs / class / Microsoft.Build.Engine / Microsoft.Build.BuildEngine / BuildProperty.cs

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
index 9c827f0953652ab5bb8bc25b71e14454f50954d3..f0936a3f65be3a40311e12ecc59e3300bfba0591 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
@@ -121,10 +121,8 @@ namespace Microsoft.Build.BuildEngine {
                        BuildProperty evaluated = new BuildProperty (Name, Value);
 
                        // In evaluate phase, properties are not expanded
-                       Expression exp = new Expression ();
-                       exp.Parse (Value, ParseOptions.None);
-                       evaluated.finalValue = (string) exp.ConvertTo (parentProject, typeof (string),
-                                       ExpressionOptions.DoNotExpandItemRefs);
+                       evaluated.finalValue = Expression.ParseAs<string> (Value, ParseOptions.None, 
+                               parentProject, ExpressionOptions.DoNotExpandItemRefs);
 
                        parentProject.EvaluatedProperties.AddProperty (evaluated);
                }