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/09/17 12:09:49 UTC

[17/18] ignite git commit: Merge branch 'ignite-1435' of https://github.com/ptupitsyn/ignite into ignite-1282

Merge branch 'ignite-1435' of https://github.com/ptupitsyn/ignite into ignite-1282


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/837de672
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/837de672
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/837de672

Branch: refs/heads/ignite-gg-10760
Commit: 837de6725659326123dcff6f9fcc56f3366e1e8c
Parents: e942cae 3e69459
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 17 12:48:27 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 17 12:48:27 2015 +0300

----------------------------------------------------------------------
 .../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/837de672/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
diff --cc modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
index 1876e24,26385e3..1bcb658
--- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
+++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
@@@ -33,14 -33,14 +33,14 @@@ using System.Runtime.InteropServices
  
  [assembly: Guid("97db45a8-f922-456a-a819-7b3c6e5e03ba")]
  
 -[assembly: AssemblyVersion("1.4.0")]
 -[assembly: AssemblyFileVersion("1.4.0")]
 +[assembly: AssemblyVersion("1.5.0")]
 +[assembly: AssemblyFileVersion("1.5.0")]
  
  [assembly: CLSCompliant(true)]
- [assembly: InternalsVisibleTo("Apache.Ignite")]
  
- #if !EXCLUDE_TESTS
+ #if !EXCLUDE_INTERNALS_VISIBLE_TO
  
+ [assembly: InternalsVisibleTo("Apache.Ignite")]
  [assembly: InternalsVisibleTo("Apache.Ignite.Core.Tests")]
  
  #endif