diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-02-19 01:02:51 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-02-19 02:19:31 +0300 |
| commit | 51297ed7ab06480df84520c758639b6cef0790d9 (patch) | |
| tree | 78e9bcc82f23a5a3cb649f67006f022a213e4554 /mcs/class/Microsoft.Build.Engine | |
| parent | 2850b1274ce3d583366d88c63bc4fb84ada7d46a (diff) | |
[Microsoft.Build.Engine] Fix bug with escaped semicolon and spaces
Diffstat (limited to 'mcs/class/Microsoft.Build.Engine')
3 files changed, 4 insertions, 4 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs index f663120bf79..57352e70f4f 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItem.cs @@ -472,7 +472,7 @@ namespace Microsoft.Build.BuildEngine { BuildItemGroup big; BuildItem bi = new BuildItem (this); - bi.finalItemSpec = taskitem.ItemSpec; + bi.finalItemSpec = ((ITaskItem2)taskitem).EvaluatedIncludeEscaped; foreach (DictionaryEntry de in taskitem.CloneCustomMetadata ()) { bi.unevaluatedMetadata.Add ((string) de.Key, (string) de.Value); diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs index ccfc0fa3a0e..536204e94fe 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Expression.cs @@ -156,7 +156,7 @@ namespace Microsoft.Build.BuildEngine { for (int i = 0; i < lists.Count; i++) { foreach (object o in lists [i]) { if (o is string) - expressionCollection.Add (MSBuildUtils.Unescape ((string) o)); + expressionCollection.Add ((string) o); else if (!allowItems && o is ItemReference) expressionCollection.Add (((ItemReference) o).OriginalString); else if (!allowMd && o is MetadataReference) { diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ExpressionCollection.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ExpressionCollection.cs index ca0034a1092..d6299066332 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ExpressionCollection.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ExpressionCollection.cs @@ -233,11 +233,11 @@ namespace Microsoft.Build.BuildEngine { // Trim and Remove empty items List<ITaskItem> toRemove = new List<ITaskItem> (); for (int i = 0; i < finalItems.Count; i ++) { - string s = finalItems [i].ItemSpec.Trim (); + string s = ((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped.Trim (); if (s.Length == 0) toRemove.Add (finalItems [i]); else - finalItems [i].ItemSpec = s; + ((ITaskItem2)finalItems [i]).EvaluatedIncludeEscaped = s; } foreach (ITaskItem ti in toRemove) finalItems.Remove (ti); |