Merge pull request #485 from mtausig/master

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

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
index 07c8378e28bf9f2e34c97c741d20198ac58c1553..709fedf1ce88f40e5419b637ed4a48a64a5458eb 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFactorExpresion.cs
@@ -25,8 +25,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#if NET_2_0
-
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -77,7 +75,9 @@ namespace Microsoft.Build.BuildEngine {
                        else if (falseValues [evaluatedToken.Value] != null)
                                return false;
                        else
-                               throw new InvalidProjectFileException ();
+                               throw new ExpressionEvaluationException (
+                                               String.Format ("Expression \"{0}\" evaluated to \"{1}\" instead of a boolean value",
+                                                               token.Value, evaluatedToken.Value));
                }
                
                public override float NumberEvaluate (Project context)
@@ -127,5 +127,3 @@ namespace Microsoft.Build.BuildEngine {
                }
        }
 }
-
-#endif