* Makefile ($(build_lib)): Make CYCLIC_DEP_FILES depend on this.

[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 7ece431c9f4696113eaaa5383314c279497b5c92..f8701183adf847cf173df37e74b2eda7df633dc2 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildProperty.cs
@@ -74,7 +74,7 @@ namespace Microsoft.Build.BuildEngine {
                        this.propertyType = PropertyType.Normal;
                        this.parentProject = parentProject;
                        this.name = propertyElement.Name;
-                       this.value = propertyElement.InnerText;
+                       this.value = propertyElement.InnerXml;
                        this.isImported = false;
                }
 
@@ -115,7 +115,7 @@ namespace Microsoft.Build.BuildEngine {
                        BuildProperty evaluated = new BuildProperty (Name, Value);
 
                        Expression exp = new Expression ();
-                       exp.Parse (Value);
+                       exp.Parse (Value, false, false);
                        evaluated.finalValue = (string) exp.ConvertTo (parentProject, typeof (string));
 
                        parentProject.EvaluatedProperties.AddProperty (evaluated);
@@ -166,7 +166,7 @@ namespace Microsoft.Build.BuildEngine {
                        set {
                                this.@value = value;
                                if (FromXml) {
-                                       propertyElement.InnerText = value;
+                                       propertyElement.InnerXml = value;
                                } else {
                                        finalValue = value;
                                }