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 2016/01/18 15:12:23 UTC
[18/50] ignite git commit: wip
wip
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/674cc533
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/674cc533
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/674cc533
Branch: refs/heads/ignite-2324
Commit: 674cc533175a97e34b5ed24d5f6af0144994e6e4
Parents: 11942fb
Author: Pavel Tupitsyn <pt...@gridgain.com>
Authored: Wed Jan 13 18:26:43 2016 +0300
Committer: Pavel Tupitsyn <pt...@gridgain.com>
Committed: Wed Jan 13 18:26:43 2016 +0300
----------------------------------------------------------------------
.../dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs | 6 ++++--
.../Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs | 1 -
modules/platforms/dotnet/Apache.Ignite.sln | 8 ++++++--
.../platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings | 1 +
4 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs
index 3e02d2f..3a01395 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Events/CacheQueryReadEvent.cs
@@ -124,8 +124,10 @@ namespace Apache.Ignite.Core.Events
/// </summary>
public object Row { get { return _row; } }
- /** <inheritDoc /> */
- public override string ToShortString()
+ /// <summary>
+ /// Gets shortened version of ToString result.
+ /// </summary>
+ public override string ToShortString()
{
return string.Format(CultureInfo.InvariantCulture,
"{0}: QueryType={1}, CacheName={2}, ClassName={3}, Clause={4}, SubjectId={5}, " +
http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs
index 02b9efc..2c67efe 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryStream.cs
@@ -678,7 +678,6 @@ namespace Apache.Ignite.Core.Impl.Memory
/// <summary>
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
/// </summary>
- // ReSharper disable once VirtualMemberNeverOverriden.Global
protected virtual void Dispose(bool disposing)
{
if (disposing)
http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln
index 164f388..e28e05e 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln
+++ b/modules/platforms/dotnet/Apache.Ignite.sln
@@ -1,5 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core", "Apache.Ignite.Core\Apache.Ignite.Core.csproj", "{4CD2F726-7E2B-46C4-A5BA-057BB82EECB6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.Core.Tests", "Apache.Ignite.Core.Tests\Apache.Ignite.Core.Tests.csproj", "{6A62F66C-DA5B-4FBB-8CE7-A95F740FDC7A}"
@@ -24,6 +27,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Apache.Ignite.dxg = Apache.Ignite.dxg
Apache.Ignite.FxCop = Apache.Ignite.FxCop
Apache.Ignite.sln.DotSettings = Apache.Ignite.sln.DotSettings
+ Apache.Ignite.sln.TeamCity.DotSettings = Apache.Ignite.sln.TeamCity.DotSettings
build.bat = build.bat
DEVNOTES.txt = DEVNOTES.txt
examples\Config\example-cache-query.xml = examples\Config\example-cache-query.xml
http://git-wip-us.apache.org/repos/asf/ignite/blob/674cc533/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
----------------------------------------------------------------------
diff --git a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
index 88a4a12..834adf4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
+++ b/modules/platforms/dotnet/Apache.Ignite.sln.TeamCity.DotSettings
@@ -24,5 +24,6 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEverywhere/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestUseVarKeywordEvident/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StaticMemberInGenericType/@EntryIndexedValue">DO_NOT_SHOW</s:String>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverriden_002EGlobal/@EntryIndexedValue">DO_NOT_SHOW</s:String>
<s:Boolean x:Key="/Default/CodeStyle/CSharpUsing/QualifiedUsingAtNestedScope/@EntryValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file