Fix bug #576589.

* ConditionFunctionExpression.cs (Exists): Check for directory also.

svn path=/trunk/mcs/; revision=150781

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
index 4fb385656330367e94ee2a21cbdc63fa711b7150..ebb6e718094cefc496840de6ebbd2542b461ee0d 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-04  Ankit Jain  <jankit@novell.com>
+
+       Fix bug #576589.
+       * ConditionFunctionExpression.cs (Exists): Check for directory also.
+
 2009-12-22  Ankit Jain  <jankit@novell.com>
 
        Fix bug #565849.

diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFunctionExpression.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFunctionExpression.cs
index ae2bead1a576ef6772870b62a0293621a31e192d..d0f253ae9d87fd3222438f1b186b1d30e00a63df 100644 (file)
--- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFunctionExpression.cs
+++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ConditionFunctionExpression.cs
@@ -113,7 +113,7 @@ namespace Microsoft.Build.BuildEngine {
                        if (!Path.IsPathRooted (file) && directory != null && directory != String.Empty)
                                file = Path.Combine (directory, file);
                
-                       return File.Exists (file);
+                       return File.Exists (file) || Directory.Exists (file);
                }
 
                static bool HasTrailingSlash (string file, Project context)