Merge remote-tracking branch 'remotes/community/ignite-1.7.3' into UPSTREAM_master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04f72c15 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04f72c15 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04f72c15 Branch: refs/heads/ignite-2788 Commit: 04f72c15485f23481fe92f3fbdf2264b28bba368 Parents: 909f046 Author: Pavel Tupitsyn <[email protected]> Authored: Mon Oct 3 14:40:47 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Mon Oct 3 14:40:47 2016 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 4 ---- modules/platforms/dotnet/Apache.Ignite.sln | 2 -- 2 files changed, 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/04f72c15/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 d956972..c1c4953 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 @@ -196,10 +196,6 @@ <Project>{C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}</Project> <Name>Apache.Ignite.NLog</Name> </ProjectReference> - <ProjectReference Include="..\Apache.Ignite.NLog\Apache.Ignite.NLog.csproj"> - <Project>{C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}</Project> - <Name>Apache.Ignite.NLog</Name> - </ProjectReference> <ProjectReference Include="..\Apache.Ignite\Apache.Ignite.csproj"> <Project>{27F7F3C6-BDDE-43A9-B565-856F8395A04B}</Project> <Name>Apache.Ignite</Name> http://git-wip-us.apache.org/repos/asf/ignite/blob/04f72c15/modules/platforms/dotnet/Apache.Ignite.sln ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.sln b/modules/platforms/dotnet/Apache.Ignite.sln index df25510..1f5163d 100644 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@ -40,8 +40,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.NLog", "Apach EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.AspNet.Tests", "Apache.Ignite.AspNet.Tests\Apache.Ignite.AspNet.Tests.csproj", "{18EA4C71-A11D-4AB1-8042-418F7559D84F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.NLog", "Apache.Ignite.NLog\Apache.Ignite.NLog.csproj", "{C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU
