In class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine:

[mono.git] / mcs / class / Microsoft.Build.Engine / Microsoft.Build.BuildEngine / ConditionAndExpression.cs

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionAndExpression.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionAndExpression.cs
index 97a66551913292a1b8f0c17ba948a98ee2a6ef3f..326e055bb43cc0bf5cdfaa0d27343ab90e70e944 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionAndExpression.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionAndExpression.cs
@@ -31,7 +31,7 @@ using System;
 using System.Xml;
 
 namespace Microsoft.Build.BuildEngine {
-       internal class ConditionAndExpression : ConditionExpression {
+       internal sealed class ConditionAndExpression : ConditionExpression {
        
                readonly ConditionExpression left;
                readonly ConditionExpression right;
@@ -70,10 +70,9 @@ namespace Microsoft.Build.BuildEngine {
                        throw new NotSupportedException ();
                }
                
-               // FIXME: check if we really can do it
                public override bool CanEvaluateToBool (Project context)
                {
-                       return true;
+                       return left.CanEvaluateToBool (context) && right.CanEvaluateToBool (context);
                }
                
                public override bool CanEvaluateToNumber (Project context)