You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/12/03 14:09:27 UTC
[12/22] ignite git commit: Fix IgniteHome resolution
Fix IgniteHome resolution
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cdeb2fed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cdeb2fed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cdeb2fed
Branch: refs/heads/ignite-1626
Commit: cdeb2fed1503bc0e309cdd331023b9443317a68b
Parents: 7421d89
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Thu Nov 12 17:19:37 2015 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Thu Nov 12 17:19:37 2015 +0300
----------------------------------------------------------------------
.../dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cdeb2fed/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs
index 335c55a..f11ec9e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Common/IgniteHome.cs
@@ -89,9 +89,11 @@ namespace Apache.Ignite.Core.Impl.Common
private static bool IsIgniteHome(DirectoryInfo dir)
{
return dir.Exists &&
- dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2 &&
- (dir.EnumerateDirectories().Count(x => x.Name == "modules") == 1 ||
- dir.EnumerateDirectories().Count(x => x.Name == "platforms") == 1);
+ (dir.EnumerateDirectories().Count(x => x.Name == "examples" || x.Name == "bin") == 2 &&
+ dir.EnumerateDirectories().Count(x => x.Name == "modules" || x.Name == "platforms") == 1)
+ || // NuGet home
+ (dir.EnumerateDirectories().Count(x => x.Name == "Config" || x.Name == "Libs") == 2 &&
+ dir.EnumerateFiles().Any(x => x.Name == "Apache.Ignite.Core.dll"));
}
}
}