X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Engine%2FMicrosoft.Build.BuildEngine%2FConditionAndExpression.cs;h=326e055bb43cc0bf5cdfaa0d27343ab90e70e944;hb=b75ff503063b30246eb81770e082f3f54799d52a;hp=97a66551913292a1b8f0c17ba948a98ee2a6ef3f;hpb=f99ce750ee781a2584e849a0264300fa4d99aaaa;p=mono.git

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 97a66551913..326e055bb43 100644
--- 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)