Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0AED918405 for ; Tue, 24 Nov 2015 11:42:22 +0000 (UTC) Received: (qmail 39288 invoked by uid 500); 24 Nov 2015 11:42:21 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39083 invoked by uid 500); 24 Nov 2015 11:42:21 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 38669 invoked by uid 99); 24 Nov 2015 11:42:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Nov 2015 11:42:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C129EE05E1; Tue, 24 Nov 2015 11:42:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: agoncharuk@apache.org To: commits@ignite.apache.org Date: Tue, 24 Nov 2015 11:42:39 -0000 Message-Id: <2a2d1150d5804834b07d30824098e8f1@git.apache.org> In-Reply-To: <90e70f98918f481193d67804998872fc@git.apache.org> References: <90e70f98918f481193d67804998872fc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/25] ignite git commit: IGNITE-1858: .NET: Updated project settings to support VS2010-VS2015. IGNITE-1858: .NET: Updated project settings to support VS2010-VS2015. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/11369331 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/11369331 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/11369331 Branch: refs/heads/ignite-1282 Commit: 11369331955070758162fbbd3904552eef390049 Parents: 512fe6b Author: Pavel Tupitsyn Authored: Tue Nov 24 11:57:39 2015 +0300 Committer: vozerov-gridgain Committed: Tue Nov 24 11:57:39 2015 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj | 3 +++ .../Apache.Ignite.Core.Tests.TestDll.csproj | 2 ++ .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 2 ++ .../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 2 ++ .../dotnet/Apache.Ignite.Core/Impl/Events/Events.cs | 8 +++++--- modules/platforms/dotnet/Apache.Ignite.sln | 6 ++---- modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj | 2 ++ .../Apache.Ignite.Examples/Apache.Ignite.Examples.csproj | 2 ++ .../Apache.Ignite.ExamplesDll.csproj | 2 ++ 9 files changed, 22 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj index 14b6466..f4c7894 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Apache.Ignite.Benchmarks.csproj @@ -19,10 +19,12 @@ x86 bin\x86\Debug\ DEBUG + 4 x86 bin\x86\Release\ + true x64 @@ -32,6 +34,7 @@ x64 bin\x64\Release\ + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj index c333bda..ebc8043 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Apache.Ignite.Core.Tests.TestDll.csproj @@ -19,6 +19,7 @@ x86 bin\x86\Release\ + true x64 @@ -27,6 +28,7 @@ x64 bin\x64\Release\ + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index a5bb7a8..72c0210 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj @@ -25,6 +25,7 @@ x64 bin\x64\Release\ true + true x86 @@ -36,6 +37,7 @@ x86 bin\x86\Release\ true + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj index d7db33e..ae10159 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj @@ -22,6 +22,7 @@ x64 bin\x64\Release\ true + true x86 @@ -33,6 +34,7 @@ x86 bin\x86\Release\ true + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs index 098102a..783ba94 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Events/Events.cs @@ -134,8 +134,9 @@ namespace Apache.Ignite.Core.Impl.Events { AsyncInstance.RemoteQuery(filter, timeout, types); - return GetFuture((futId, futTyp) => UU.TargetListenFutureForOperation(AsyncInstance.Target, futId, futTyp, - (int) Op.RemoteQuery), convertFunc: ReadEvents).Task; + // ReSharper disable once RedundantTypeArgumentsOfMethod (won't compile in VS2010) + return GetFuture>((futId, futTyp) => UU.TargetListenFutureForOperation(AsyncInstance.Target, + futId, futTyp, (int) Op.RemoteQuery), convertFunc: ReadEvents).Task; } /** */ @@ -251,7 +252,8 @@ namespace Apache.Ignite.Core.Impl.Events { AsyncInstance.WaitForLocal0(filter, ref hnd, types); - var fut = GetFuture((futId, futTyp) => UU.TargetListenFutureForOperation(AsyncInstance.Target, futId, + // ReSharper disable once RedundantTypeArgumentsOfMethod (won't compile in VS2010) + var fut = GetFuture((futId, futTyp) => UU.TargetListenFutureForOperation(AsyncInstance.Target, futId, futTyp, (int) Op.WaitForLocal), convertFunc: reader => (T) EventReader.Read(reader)); if (filter != null) http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite.sln ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index 6b29e9d..929af73 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -1,8 +1,6 @@  -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.31101.0 -MinimumVisualStudioVersion = 10.0.40219.1 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 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}" http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj index a58a660..fa7d6cf 100644 --- a/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj +++ b/modules/platforms/dotnet/Apache.Ignite/Apache.Ignite.csproj @@ -19,6 +19,7 @@ x64 bin\x64\Release\ + true x86 @@ -27,6 +28,7 @@ x86 bin\x86\Release\ + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj index e28ab75..a693930 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj +++ b/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Apache.Ignite.Examples.csproj @@ -21,6 +21,7 @@ bin\x64\Release\ full true + true Apache.Ignite.Examples.Compute.TaskExample @@ -35,6 +36,7 @@ bin\x86\Release\ x86 MinimumRecommendedRules.ruleset + true true http://git-wip-us.apache.org/repos/asf/ignite/blob/11369331/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj index 60e1ec7..59d2866 100644 --- a/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj +++ b/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Apache.Ignite.ExamplesDll.csproj @@ -21,6 +21,7 @@ bin\x64\Release\ full true + true true @@ -32,6 +33,7 @@ bin\x86\Release\ x86 MinimumRecommendedRules.ruleset + true true