For expression stuff, change namespace to MS.Build.Internal.Expressionns.

[mono.git] / mcs / class / Microsoft.Build / Microsoft.Build.Evaluation / Project.cs

diff --git a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
index 772a905b9156c6fd30a7906547ea1c1113e2dfb0..b1741a8e521f6e9a35064e1eef98e35774c592fb 100644 (file)
--- a/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
+++ b/mcs/class/Microsoft.Build/Microsoft.Build.Evaluation/Project.cs
@@ -41,6 +41,7 @@ using Microsoft.Build.Exceptions;
 using Microsoft.Build.Execution;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Internal;
+using Microsoft.Build.Internal.Expressions;
 using Microsoft.Build.Logging;
 using System.Collections;
 
@@ -234,7 +235,7 @@ namespace Microsoft.Build.Evaluation
                        EvaluateItems (elements);
                        
                        // finally, evaluate targets and tasks
-                       EvaluateTasks (elements);
+                       EvaluateTargets (elements);
                }
                
                IEnumerable<ProjectElement> EvaluatePropertiesAndImports (IEnumerable<ProjectElement> elements)
@@ -317,7 +318,7 @@ namespace Microsoft.Build.Evaluation
                        all_evaluated_items.Sort ((p1, p2) => string.Compare (p1.ItemType, p2.ItemType, StringComparison.OrdinalIgnoreCase));
                }
                
-               void EvaluateTasks (IEnumerable<ProjectElement> elements)
+               void EvaluateTargets (IEnumerable<ProjectElement> elements)
                {
                        foreach (var child in elements) {
                                var te = child as ProjectTargetElement;
@@ -503,13 +504,13 @@ namespace Microsoft.Build.Evaluation
 
                public static string GetMetadataValueEscaped (ProjectItem item, string name)
                {
-                       var md = item.GetMetadata (name);
+                       var md = item.Metadata.FirstOrDefault (m => m.Name.Equals (name, StringComparison.OrdinalIgnoreCase));
                        return md != null ? ProjectCollection.Escape (md.EvaluatedValue) : null;
                }
 
                public static string GetMetadataValueEscaped (ProjectItemDefinition item, string name)
                {
-                       var md = item.Metadata.FirstOrDefault (m => m.Name == name);
+                       var md = item.Metadata.FirstOrDefault (m => m.Name.Equals (name, StringComparison.OrdinalIgnoreCase));
                        return md != null ? ProjectCollection.Escape (md.EvaluatedValue) : null;
                }
 
@@ -522,6 +523,7 @@ namespace Microsoft.Build.Evaluation
                public static string GetPropertyValueEscaped (ProjectProperty property)
                {
                        // WTF happens here.
+                       //return ProjectCollection.Escape (property.EvaluatedValue);
                        return property.EvaluatedValue;
                }