Merge ignite-1.7.3 to master.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a01927a9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a01927a9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a01927a9 Branch: refs/heads/ignite-2788 Commit: a01927a91ba7bf0544e1afa61459b452e4c785d8 Parents: 04f72c1 bfdb5c3 Author: Alexey Kuznetsov <[email protected]> Authored: Tue Oct 4 16:50:36 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Tue Oct 4 16:50:36 2016 +0700 ---------------------------------------------------------------------- .../Apache.Ignite.Core.Tests.NuGet.csproj | 10 + .../Log4NetTest.cs | 87 +++++++++ .../packages.config | 2 + .../Apache.Ignite.Core.Tests.csproj | 9 + .../Log/Log4NetLoggerTest.cs | 188 +++++++++++++++++++ .../Apache.Ignite.Core.Tests/packages.config | 4 +- .../Apache.Ignite.Log4Net.csproj | 76 ++++++++ .../Apache.Ignite.Log4Net.nuspec | 50 +++++ .../Apache.Ignite.Log4Net.snk | Bin 0 -> 596 bytes .../IgniteLog4NetLogger.cs | 123 ++++++++++++ .../Properties/AssemblyInfo.cs | 40 ++++ .../Apache.Ignite.Log4Net/packages.config | 20 ++ .../Properties/AssemblyInfo.cs | 2 +- modules/platforms/dotnet/Apache.Ignite.sln | 14 ++ .../frontend/controllers/caches-controller.js | 14 ++ 15 files changed, 637 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a01927a9/modules/platforms/dotnet/Apache.Ignite.Core.Tests.NuGet/Apache.Ignite.Core.Tests.NuGet.csproj ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a01927a9/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,008229a..840d970 --- 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 @@@ -55,22 -59,10 +59,23 @@@ <Reference Include="System.Runtime.Serialization" /> <Reference Include="System.ServiceProcess" /> <Reference Include="System.XML" /> + <Reference Include="System.Xml.Linq" /> </ItemGroup> <ItemGroup> + <Compile Include="Binary\BinaryReaderWriterTest.cs" /> + <Compile Include="Binary\IO\BinaryStreamsTest.cs" /> + <Compile Include="Binary\JavaTypeMappingTest.cs" /> + <Compile Include="Binary\TypeResolverTest.cs" /> + <Compile Include="Cache\Affinity\AffinityKeyTest.cs" /> + <Compile Include="Cache\Affinity\AffinityTopologyVersionTest.cs" /> + <Compile Include="Cache\CacheResultTest.cs" /> + <Compile Include="Cache\Store\CacheStoreAdapterTest.cs" /> + <Compile Include="Collections\MultiValueDictionaryTest.cs" /> + <Compile Include="Collections\ReadOnlyCollectionTest.cs" /> + <Compile Include="Collections\ReadOnlyDictionaryTest.cs" /> + <Compile Include="Common\IgniteGuidTest.cs" /> <Compile Include="Log\DefaultLoggerTest.cs" /> + <Compile Include="Log\Log4NetLoggerTest.cs" /> <Compile Include="Log\NLogLoggerTest.cs" /> <Compile Include="TestAppConfig.cs" /> <Compile Include="Binary\BinaryBuilderSelfTestFullFooter.cs" /> http://git-wip-us.apache.org/repos/asf/ignite/blob/a01927a9/modules/platforms/dotnet/Apache.Ignite.Core.Tests/packages.config ---------------------------------------------------------------------- diff --cc modules/platforms/dotnet/Apache.Ignite.Core.Tests/packages.config index c1198cb,d369a35..ccf079c --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/packages.config +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/packages.config @@@ -19,4 -19,6 +19,6 @@@ <packages> <package id="NUnit.Runners" version="2.6.3" targetFramework="net40" /> - </packages> + <package id="log4net" version="2.0.5" targetFramework="net40" /> + <package id="NLog" version="4.3.7" targetFramework="net40" /> -</packages> ++</packages> http://git-wip-us.apache.org/repos/asf/ignite/blob/a01927a9/modules/platforms/dotnet/Apache.Ignite.NLog/Properties/AssemblyInfo.cs ----------------------------------------------------------------------
