diff --git a/src/Abc.Zebus.Directory.Cassandra.Tests/Abc.Zebus.Directory.Cassandra.Tests.csproj b/src/Abc.Zebus.Directory.Cassandra.Tests/Abc.Zebus.Directory.Cassandra.Tests.csproj index 3cf687c..c0f69d2 100644 --- a/src/Abc.Zebus.Directory.Cassandra.Tests/Abc.Zebus.Directory.Cassandra.Tests.csproj +++ b/src/Abc.Zebus.Directory.Cassandra.Tests/Abc.Zebus.Directory.Cassandra.Tests.csproj @@ -30,13 +30,13 @@ 4 - - False - ..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll + + ..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll + True - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\Abc.Zebus.Testing.dll + + ..\packages\Zebus.Testing.1.2.0\lib\net45\Abc.Zebus.Testing.dll + True False @@ -57,44 +57,48 @@ ..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\KellermanSoftware.Compare-NET-Objects.dll + + ..\packages\CompareNETObjects.3.01.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll + True - - False + ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True False ..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\Moq.dll + + ..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll + True - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\Newtonsoft.Json.dll + + ..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll + True - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\nunit.framework.dll + + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + True - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\Ploeh.AutoFixture.dll + + ..\packages\AutoFixture.3.21.1\lib\net40\Ploeh.AutoFixture.dll + True - - False - ..\..\lib\protobuf\protobuf-net.dll + + ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll + True ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - - False - ..\packages\Zebus.Testing.1.1.7\lib\net45\StructureMap.dll + + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll + True + + + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll + True diff --git a/src/Abc.Zebus.Directory.Cassandra.Tests/packages.config b/src/Abc.Zebus.Directory.Cassandra.Tests/packages.config index e196b38..ce1e131 100644 --- a/src/Abc.Zebus.Directory.Cassandra.Tests/packages.config +++ b/src/Abc.Zebus.Directory.Cassandra.Tests/packages.config @@ -1,11 +1,18 @@  + + + + + + - - + + + \ No newline at end of file diff --git a/src/Abc.Zebus.Directory.Cassandra/Abc.Zebus.Directory.Cassandra.csproj b/src/Abc.Zebus.Directory.Cassandra/Abc.Zebus.Directory.Cassandra.csproj index d0e0ae4..e6bfecd 100644 --- a/src/Abc.Zebus.Directory.Cassandra/Abc.Zebus.Directory.Cassandra.csproj +++ b/src/Abc.Zebus.Directory.Cassandra/Abc.Zebus.Directory.Cassandra.csproj @@ -30,9 +30,8 @@ 4 - - False - ..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll + + ..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll False @@ -61,15 +60,23 @@ False ..\packages\lz4net.1.0.5.93\lib\net40-client\LZ4.dll - + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll + + False - ..\..\lib\protobuf\protobuf-net.dll + ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll ..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll - - ..\..\lib\structuremap\StructureMap.dll + + False + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll + + + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll diff --git a/src/Abc.Zebus.Directory.Cassandra/Cql/CassandraCqlSessionManager.cs b/src/Abc.Zebus.Directory.Cassandra/Cql/CassandraCqlSessionManager.cs index 4f6fb48..c7aa2ef 100644 --- a/src/Abc.Zebus.Directory.Cassandra/Cql/CassandraCqlSessionManager.cs +++ b/src/Abc.Zebus.Directory.Cassandra/Cql/CassandraCqlSessionManager.cs @@ -2,11 +2,9 @@ using System.Collections.Concurrent; using System.Linq; using Cassandra; -using StructureMap; namespace Abc.Zebus.Directory.Cassandra.Cql { - [PluginFamily(IsSingleton = true)] public class CassandraCqlSessionManager : IDisposable { private readonly ConcurrentDictionary _clusters = new ConcurrentDictionary(); diff --git a/src/Abc.Zebus.Directory.Cassandra/packages.config b/src/Abc.Zebus.Directory.Cassandra/packages.config index 728a68b..a83c1a0 100644 --- a/src/Abc.Zebus.Directory.Cassandra/packages.config +++ b/src/Abc.Zebus.Directory.Cassandra/packages.config @@ -5,6 +5,9 @@ + + - + + \ No newline at end of file diff --git a/src/Abc.Zebus.Directory.Tests/Abc.Zebus.Directory.Tests.csproj b/src/Abc.Zebus.Directory.Tests/Abc.Zebus.Directory.Tests.csproj index 0118187..4f1ebd7 100644 --- a/src/Abc.Zebus.Directory.Tests/Abc.Zebus.Directory.Tests.csproj +++ b/src/Abc.Zebus.Directory.Tests/Abc.Zebus.Directory.Tests.csproj @@ -30,39 +30,48 @@ 4 - - False - ..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll + + ..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll + True - ..\packages\Zebus.Testing.1.1.7\lib\net45\Abc.Zebus.Testing.dll + ..\packages\Zebus.Testing.1.2.0\lib\net45\Abc.Zebus.Testing.dll True - ..\packages\Zebus.Testing.1.1.7\lib\net45\KellermanSoftware.Compare-NET-Objects.dll + ..\packages\CompareNETObjects.3.01.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll True ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll + True - ..\packages\Zebus.Testing.1.1.7\lib\net45\Moq.dll + ..\packages\Moq.4.2.1409.1722\lib\net40\Moq.dll True - ..\packages\Zebus.Testing.1.1.7\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll True - ..\packages\Zebus.Testing.1.1.7\lib\net45\nunit.framework.dll + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll True - ..\packages\Zebus.Testing.1.1.7\lib\net45\Ploeh.AutoFixture.dll + ..\packages\AutoFixture.3.21.1\lib\net40\Ploeh.AutoFixture.dll + True + + + ..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll True - ..\packages\Zebus.Testing.1.1.7\lib\net45\StructureMap.dll + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll + True + + + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll True diff --git a/src/Abc.Zebus.Directory.Tests/packages.config b/src/Abc.Zebus.Directory.Tests/packages.config index 96b52d9..088124f 100644 --- a/src/Abc.Zebus.Directory.Tests/packages.config +++ b/src/Abc.Zebus.Directory.Tests/packages.config @@ -1,6 +1,13 @@  + + - - + + + + + + + \ No newline at end of file diff --git a/src/Abc.Zebus.Directory.sln b/src/Abc.Zebus.Directory.sln index 9ef75b0..061f40c 100644 --- a/src/Abc.Zebus.Directory.sln +++ b/src/Abc.Zebus.Directory.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.30723.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "@ Solution Items", "@ Solution Items", "{A85342C3-7BA4-4A6B-B690-B1D0ACE14C76}" ProjectSection(SolutionItems) = preProject diff --git a/src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj b/src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj index 2ed077a..56ddf28 100644 --- a/src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj +++ b/src/Abc.Zebus.Directory/Abc.Zebus.Directory.csproj @@ -34,16 +34,22 @@ - - False - ..\packages\Zebus.1.1.7\lib\net45\Abc.Zebus.dll + + ..\packages\Zebus.1.2.0\lib\net45\Abc.Zebus.dll ..\packages\log4net.2.0.3\lib\net40-full\log4net.dll - + + False + ..\packages\Newtonsoft.Json.6.0.6\lib\net45\Newtonsoft.Json.dll + + False - ..\..\lib\structuremap\StructureMap.dll + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.dll + + + ..\packages\structuremap.3.1.4.143\lib\net40\StructureMap.Net4.dll diff --git a/src/Abc.Zebus.Directory/App.config b/src/Abc.Zebus.Directory/App.config index bd2b899..8801c81 100644 --- a/src/Abc.Zebus.Directory/App.config +++ b/src/Abc.Zebus.Directory/App.config @@ -1,13 +1,11 @@ - + - - - - - + + + - + \ No newline at end of file diff --git a/src/Abc.Zebus.Directory/Program.cs b/src/Abc.Zebus.Directory/Program.cs index be97340..4df6c33 100644 --- a/src/Abc.Zebus.Directory/Program.cs +++ b/src/Abc.Zebus.Directory/Program.cs @@ -10,6 +10,7 @@ using Abc.Zebus.Util; using log4net; using log4net.Config; +using StructureMap; namespace Abc.Zebus.Directory { @@ -64,7 +65,7 @@ private static void InjectDirectoryServiceSpecificConfiguration(BusFactory busFa c.ForSingletonOf().Use(); c.Forward(); - c.ForSingletonOf().Use(ctx => + c.ForSingletonOf().Use(typeof(Func).Name, ctx => { var dispatcher = ctx.GetInstance(); dispatcher.ConfigureHandlerFilter(x => x != typeof(PeerDirectoryClient)); diff --git a/src/Abc.Zebus.Directory/packages.config b/src/Abc.Zebus.Directory/packages.config index 8b89cbe..08a1484 100644 --- a/src/Abc.Zebus.Directory/packages.config +++ b/src/Abc.Zebus.Directory/packages.config @@ -1,5 +1,8 @@  - + + + + \ No newline at end of file diff --git a/src/SharedVersionInfo.cs b/src/SharedVersionInfo.cs index 44994df..5a26fdc 100644 --- a/src/SharedVersionInfo.cs +++ b/src/SharedVersionInfo.cs @@ -1,5 +1,5 @@ using System.Reflection; -[assembly: AssemblyVersion("1.1.7")] -[assembly: AssemblyFileVersion("1.1.7")] -[assembly: AssemblyInformationalVersion("1.1.7")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0")] +[assembly: AssemblyFileVersion("1.2.0")] +[assembly: AssemblyInformationalVersion("1.2.0")] \ No newline at end of file