Merge pull request #303 from ermshiperete/5278

[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 beac4824396ea67c4a54b3a47c7b26343e4ebc49..62caeda9edbf65629c676554e72c7d44be9087b0 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
@@ -35,6 +35,7 @@ using System.Xml;
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
+using Mono.XBuild.Utilities;
 
 namespace Microsoft.Build.BuildEngine {
        public class BuildProperty {
@@ -80,7 +81,7 @@ namespace Microsoft.Build.BuildEngine {
                        this.propertyType = PropertyType.Normal;
                        this.parentProject = parentProject;
                        this.name = propertyElement.Name;
-                       this.value = Utilities.UnescapeFromXml (propertyElement.InnerXml);
+                       this.value = MSBuildUtils.UnescapeFromXml (propertyElement.InnerXml);
                        this.isImported = false;
                }
 
@@ -173,8 +174,8 @@ namespace Microsoft.Build.BuildEngine {
                                Expression exp = new Expression ();
 
                                // in non-evaluation phase, properties are always expanded
-                               exp.Parse (FinalValue, options == ExpressionOptions.ExpandItemRefs ?
-                                                       ParseOptions.AllowItems : ParseOptions.None);
+                               exp.Parse (FinalValue, ParseOptions.Split | (options == ExpressionOptions.ExpandItemRefs ?
+                                                       ParseOptions.AllowItems : ParseOptions.None));
                                return (ITaskItem[]) exp.ConvertTo (project, typeof (ITaskItem[]), options);
                        } finally {
                                converting = false;