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/909f0466 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/909f0466 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/909f0466 Branch: refs/heads/ignite-2788 Commit: 909f0466e1c600063dd7b5b3e1b69a26e2243364 Parents: 2137740 48b293d Author: Pavel Tupitsyn <[email protected]> Authored: Mon Oct 3 14:16:06 2016 +0300 Committer: Pavel Tupitsyn <[email protected]> Committed: Mon Oct 3 14:16:06 2016 +0300 ---------------------------------------------------------------------- .../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 4 ++++ modules/platforms/dotnet/Apache.Ignite.sln | 2 ++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/909f0466/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj index c1c4953,ef62498..d956972 --- 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,6 -184,6 +196,10 @@@ <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/909f0466/modules/platforms/dotnet/Apache.Ignite.sln ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.sln index 1f5163d,2978780..df25510 --- a/modules/platforms/dotnet/Apache.Ignite.sln +++ b/modules/platforms/dotnet/Apache.Ignite.sln @@@ -36,10 -36,10 +36,12 @@@ Project("{FAE04EC0-301F-11D3-BF4B-00C04 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.AspNet", "Apache.Ignite.AspNet\Apache.Ignite.AspNet.csproj", "{13EA96FC-CC83-4164-A7C0-4F30ED797460}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.Ignite.NLog", "Apache.Ignite.NLog\Apache.Ignite.NLog.csproj", "{C6B58E4A-A2E9-4554-AD02-68CE6DA5CFB7}" +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
