Merge pull request #7 from XerProjects/dev

Release 2.0.0

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.Microsoft.DependencyInjection/CqrsBuilder.cs

@@ -3,7 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 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.Microsoft.DependencyInjection.Tests")]

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/CqrsCommandHandlerSelector.cs

@@ -3,8 +3,9 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 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.Microsoft.DependencyInjection
@@ -82,7 +83,7 @@ public ICqrsCommandHandlerSelector ByAttribute(ServiceLifetime lifetime, params
             _serviceCollection.AddSingleton<CommandHandlerDelegateResolver>(serviceProvider => 
             {
                 var singleMessageHandlerRegistration = new SingleMessageHandlerRegistration();
-                singleMessageHandlerRegistration.RegisterCommandHandlerAttributes(assemblies, serviceProvider.GetRequiredService);
+                singleMessageHandlerRegistration.RegisterCommandHandlersByAttribute(assemblies, serviceProvider.GetRequiredService);
 
                 return new CommandHandlerDelegateResolver(singleMessageHandlerRegistration.BuildMessageHandlerResolver());
             });

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/CqrsEventHandlerSelector.cs

@@ -3,8 +3,9 @@
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 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.Microsoft.DependencyInjection
 {
@@ -78,7 +79,7 @@ public ICqrsEventHandlerSelector ByAttribute(ServiceLifetime lifetime, params As
             _serviceCollection.AddSingleton<EventHandlerDelegateResolver>(serviceProvider => 
             {
                 var multiMessageHandlerRegistration = new MultiMessageHandlerRegistration();
-                multiMessageHandlerRegistration.RegisterEventHandlerAttributes(assemblies, serviceProvider.GetRequiredService);
+                multiMessageHandlerRegistration.RegisterEventHandlersByAttribute(assemblies, serviceProvider.GetRequiredService);
 
                 return new EventHandlerDelegateResolver(multiMessageHandlerRegistration.BuildMessageHandlerResolver());
             });

Src/Xer.Cqrs.Extensions.Microsoft.DependencyInjection/Xer.Cqrs.Extensions.Microsoft.DependencyInjection.csproj

@@ -7,8 +7,10 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
     <PackageReference Include="Scrutor" Version="2.2.2" />
-    <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.Microsoft.DependencyInjection.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.Microsoft.DependencyInjection.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

Tests/Xer.Cqrs.Extensions.Microsoft.DependencyInjection.Tests/Xer.Cqrs.Extensions.Microsoft.DependencyInjection.Tests.csproj

@@ -7,9 +7,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.1.1" />
+    <PackageReference Include="FluentAssertions" Version="5.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />