projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* 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 013a0d75691e2f2e119e1d13ec370bcdcb834de9..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.propertyType = PropertyType.Normal;
this.parentProject = parentProject;
this.name = propertyElement.Name;
- this.value = propertyElement.Inner
Text
;
+ this.value = propertyElement.Inner
Xml
;
this.isImported = false;
}
this.isImported = false;
}
@@
-115,7
+115,7
@@
namespace Microsoft.Build.BuildEngine {
BuildProperty evaluated = new BuildProperty (Name, Value);
Expression exp = new Expression ();
BuildProperty evaluated = new BuildProperty (Name, Value);
Expression exp = new Expression ();
- exp.Parse (Value, false);
+ exp.Parse (Value, false
, false
);
evaluated.finalValue = (string) exp.ConvertTo (parentProject, typeof (string));
parentProject.EvaluatedProperties.AddProperty (evaluated);
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) {
set {
this.@value = value;
if (FromXml) {
- propertyElement.Inner
Text
= value;
+ propertyElement.Inner
Xml
= value;
} else {
finalValue = value;
}
} else {
finalValue = value;
}