Merge pull request #3 from XerProjects/feature-v2

Update for v2

Author: joel-jeremy

GitVersion.yml

@@ -1,5 +1,5 @@
 mode: ContinuousDelivery
-next-version: 1.0.0
+next-version: 2.0.0
 branches: {}
 ignore:
   sha: []

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsBuilder.cs

@@ -4,7 +4,7 @@
 using SimpleInjector;
 using Xer.Cqrs.CommandStack;
 using Xer.Cqrs.EventStack;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
 using Xer.Delegator.Resolvers;
 
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Xer.Cqrs.Extensions.SimpleInjector.Tests")]

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsCommandHandlerSelector.cs

@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Reflection;
 using SimpleInjector;
-using SimpleInjector.Advanced;
 using Xer.Cqrs.CommandStack;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 using Xer.Cqrs.CommandStack.Resolvers;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
 using Xer.Delegator.Resolvers;
 
 namespace Xer.Cqrs.Extensions.SimpleInjector
@@ -100,7 +100,7 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assem
             }
 
             var singleMessageHandlerRegistration = new SingleMessageHandlerRegistration();
-            singleMessageHandlerRegistration.RegisterCommandHandlerAttributes(allTypes, _container.GetInstance);
+            singleMessageHandlerRegistration.RegisterCommandHandlersByAttribute(allTypes, _container.GetInstance);
 
             // Register resolver.
             _container.Collections.AppendTo(

Src/Xer.Cqrs.Extensions.SimpleInjector/CqrsEventHandlerSelector.cs

@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Reflection;
 using SimpleInjector;
-using SimpleInjector.Advanced;
 using Xer.Cqrs.EventStack;
+using Xer.Cqrs.EventStack.Extensions.Attributes;
 using Xer.Cqrs.EventStack.Resolvers;
-using Xer.Delegator.Registrations;
+using Xer.Delegator.Registration;
 
 namespace Xer.Cqrs.Extensions.SimpleInjector
 {
@@ -85,7 +85,7 @@ public ICqrsEventHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assembl
             }
 
             var multiMessageHandlerRegistration = new MultiMessageHandlerRegistration();
-            multiMessageHandlerRegistration.RegisterEventHandlerAttributes(allTypes, _container.GetInstance);
+            multiMessageHandlerRegistration.RegisterEventHandlersByAttribute(allTypes, _container.GetInstance);
 
             // Register resolver.
             _container.Collections.AppendTo(

Src/Xer.Cqrs.Extensions.SimpleInjector/Xer.Cqrs.Extensions.SimpleInjector.csproj

@@ -12,8 +12,10 @@
 
   <ItemGroup>
     <PackageReference Include="SimpleInjector" Version="4.1.1" />
-    <PackageReference Include="Xer.Cqrs.CommandStack" Version="1.0.0" />
-    <PackageReference Include="Xer.Cqrs.EventStack" Version="1.0.0" />
+    <PackageReference Include="Xer.Cqrs.CommandStack" Version="2.0.0" />
+    <PackageReference Include="Xer.Cqrs.CommandStack.Extensions.Attributes" Version="1.0.0" />
+    <PackageReference Include="Xer.Cqrs.EventStack" Version="2.0.0" />
+    <PackageReference Include="Xer.Cqrs.EventStack.Extensions.Attributes" Version="1.0.0" />
   </ItemGroup>
 
 </Project>

Tests/Xer.Cqrs.Extensions.SimpleInjector.Tests/Entities/CommandHandlers.cs

@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xer.Cqrs.CommandStack;
-using Xer.Cqrs.CommandStack.Attributes;
+using Xer.Cqrs.CommandStack.Extensions.Attributes;
 using Xunit.Abstractions;
 
 namespace Tests.Entities.CommandHandlers

Tests/Xer.Cqrs.Extensions.SimpleInjector.Tests/Entities/EventHandlers.cs

@@ -1,7 +1,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Xer.Cqrs.EventStack;
-using Xer.Cqrs.EventStack.Attributes;
+using Xer.Cqrs.EventStack.Extensions.Attributes;
 using Xunit.Abstractions;
 
 namespace Tests.Entities.EventHandlers