Merge pull request #2 from XerProjects/feature-v1

Update for v1

Author: joel-jeremy

.gitignore

@@ -1,7 +1,5 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-##
-## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
 # User-specific files
 *.suo
@@ -42,11 +40,10 @@ TestResult.xml
 [Rr]eleasePS/
 dlldata.c
 
-# .NET Core
+# DNX
 project.lock.json
 project.fragment.lock.json
 artifacts/
-**/Properties/launchSettings.json
 
 *_i.c
 *_p.c
@@ -113,10 +110,6 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
@@ -150,7 +143,7 @@ publish/
 *.azurePubxml
 # TODO: Comment the next line if you want to checkin your web deploy settings
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
@@ -166,7 +159,7 @@ PublishScripts/
 !**/packages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
 #!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignorable files
+# NuGet v3's project.json files produces more ignoreable files
 *.nuget.props
 *.nuget.targets
 
@@ -199,6 +192,7 @@ ClientBin/
 *.jfm
 *.pfx
 *.publishsettings
+node_modules/
 orleans.codegen.cs
 
 # Since there are multiple workflows, uncomment next line to ignore bower_components
@@ -219,7 +213,6 @@ UpgradeLog*.htm
 # SQL Server files
 *.mdf
 *.ldf
-*.ndf
 
 # Business Intelligence projects
 *.rdl.data
@@ -234,20 +227,13 @@ FakesAssemblies/
 
 # Node.js Tools for Visual Studio
 .ntvs_analysis.dat
-node_modules/
-
-# Typescript v1 declaration files
-typings/
 
 # Visual Studio 6 build log
 *.plg
 
 # Visual Studio 6 workspace options file
 *.opt
 
-# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
-*.vbw
-
 # Visual Studio LightSwitch build output
 **/*.HTMLClient/GeneratedArtifacts
 **/*.DesktopClient/GeneratedArtifacts
@@ -274,18 +260,9 @@ paket-files/
 __pycache__/
 *.pyc
 
-# Cake - Uncomment if you are using it
-# tools/**
-# !tools/packages.config
-
-# Telerik's JustMock configuration file
-*.jmconfig
-
-# BizTalk build output
-*.btp.cs
-*.btm.cs
-*.odx.cs
-*.xsd.cs
-
 # VS Code
-.vscode/
+.vscode/
+
+tools/**
+!tools/packages.config
+BuildArtifacts/**

GitVersion.yml

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

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

@@ -7,6 +7,8 @@
 using Xer.Delegator.Registrations;
 using Xer.Delegator.Resolvers;
 
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("Xer.Cqrs.Extensions.SimpleInjector.Tests")]
+
 namespace Xer.Cqrs.Extensions.SimpleInjector
 {
     internal class CqrsBuilder : ICqrsBuilder

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

@@ -37,13 +37,18 @@ public ICqrsCommandHandlerSelector ByInterface(Lifestyle lifeStyle, params Assem
                 throw new ArgumentNullException(nameof(assemblies));
             }
 
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+            }
+
             IEnumerable<Assembly> distinctAssemblies = assemblies.Distinct();
 
             _container.Register(typeof(ICommandAsyncHandler<>), distinctAssemblies, lifeStyle);
             _container.Register(typeof(ICommandHandler<>), distinctAssemblies, lifeStyle);
 
             // Register resolver.
-            _container.AppendToCollection(
+            _container.Collections.AppendTo(
                 typeof(CommandHandlerDelegateResolver),
                 Lifestyle.Singleton.CreateRegistration(() =>
                     new CommandHandlerDelegateResolver(
@@ -74,6 +79,11 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assem
             {
                 throw new ArgumentNullException(nameof(assemblies));
             }
+
+            if (assemblies.Length == 0)
+            {
+                throw new ArgumentException("No assemblies were provided.", nameof(assemblies));
+            }
 
             // Get all types that has methods marked with [CommandHandler] attribute from distinct assemblies.
             IEnumerable<Type> allTypes = assemblies.Distinct()
@@ -83,7 +93,7 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assem
                                                                   CommandHandlerAttributeMethod.IsFoundInType(type))
                                                    .ToArray();
 
-            foreach(Type type in allTypes)
+            foreach (Type type in allTypes)
             {
                 // Register type as self.
                 _container.Register(type, type, lifeStyle);
@@ -93,7 +103,7 @@ public ICqrsCommandHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assem
             singleMessageHandlerRegistration.RegisterCommandHandlerAttributes(allTypes, _container.GetInstance);
 
             // Register resolver.
-            _container.AppendToCollection(
+            _container.Collections.AppendTo(
                 typeof(CommandHandlerDelegateResolver),
                 Lifestyle.Singleton.CreateRegistration(() =>
                     new CommandHandlerDelegateResolver(singleMessageHandlerRegistration.BuildMessageHandlerResolver()),

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

@@ -42,7 +42,7 @@ public ICqrsEventHandlerSelector ByInterface(Lifestyle lifeStyle, params Assembl
             _container.Register(typeof(IEventHandler<>), distinctAssemblies, lifeStyle);
 
             // Register resolver.
-            _container.AppendToCollection(
+            _container.Collections.AppendTo(
                 typeof(EventHandlerDelegateResolver),
                 Lifestyle.Singleton.CreateRegistration(() =>
                     new EventHandlerDelegateResolver(new ContainerEventHandlerResolver(new SimpleInjectorContainerAdapter(_container))),
@@ -78,7 +78,7 @@ public ICqrsEventHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assembl
                                                                   EventHandlerAttributeMethod.IsFoundInType(type))
                                                    .ToArray();
 
-            foreach(Type type in allTypes)
+            foreach (Type type in allTypes)
             {
                 // Register type as self.
                 _container.Register(type, type, lifeStyle);
@@ -88,7 +88,7 @@ public ICqrsEventHandlerSelector ByAttribute(Lifestyle lifeStyle, params Assembl
             multiMessageHandlerRegistration.RegisterEventHandlerAttributes(allTypes, _container.GetInstance);
 
             // Register resolver.
-            _container.AppendToCollection(
+            _container.Collections.AppendTo(
                 typeof(EventHandlerDelegateResolver),
                 Lifestyle.Singleton.CreateRegistration(() =>
                     new EventHandlerDelegateResolver(multiMessageHandlerRegistration.BuildMessageHandlerResolver()),

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

@@ -2,13 +2,18 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <Authors>jeyjeyemem;mvput;xerprojects-contributors;</Authors>
+    <Description>SimpleInjector container integration for Xer.Cqrs.</Description>
+    <Copyright>Copyright (c) XerProjects contributors</Copyright>
+    <PackageLicenseUrl>https://github.com/XerProjects/Xer.Cqrs.Extensions.SimpleInjector/blob/master/LICENSE</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/XerProjects/Xer.Cqrs.Extensions.SimpleInjector</PackageProjectUrl>
+    <PackageTags>simple-injector;container;ioc;ioc-container;cqrs;extension</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SimpleInjector" Version="4.0.12" />
-    <PackageReference Include="Xer.Cqrs.CommandStack" Version="0.2.3" />
-    <PackageReference Include="Xer.Cqrs.EventStack" Version="0.2.3" />
-    <PackageReference Include="Xer.Delegator" Version="0.3.0" />
+    <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" />
   </ItemGroup>
 
 </Project>

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

@@ -29,7 +29,7 @@ public void ShouldRegisterAllCommandHandlersAndEventHandlersInAssembly()
             {
                 Container container = new Container();
                 container.RegisterCqrs(_handlerAssembly);
-                container.RegisterSingleton(_outputHelper);
+                container.RegisterInstance(_outputHelper);
                 container.Verify();
 
                 var commandHandlerResolvers = container.GetAllInstances<CommandHandlerDelegateResolver>();
@@ -62,7 +62,7 @@ public void ShouldRegisterAllCommandHandlersInAssembly()
                 container.RegisterCqrsCore()
                          .RegisterCommandHandlers(select => select.ByInterface(_handlerAssembly));
 
-                container.RegisterSingleton(_outputHelper);
+                container.RegisterInstance(_outputHelper);
                 container.Verify();
 
                 var resolvers = container.GetAllInstances<CommandHandlerDelegateResolver>();
@@ -80,7 +80,7 @@ public void ShouldRegisterAllCommandHandlerAttributesInAssembly()
                 Container container = new Container();
                 container.RegisterCqrsCore()
                          .RegisterCommandHandlers(select => select.ByAttribute(Lifestyle.Transient, _handlerAssembly));
-                container.RegisterSingleton(_outputHelper);
+                container.RegisterInstance(_outputHelper);
                 container.Verify();
 
                 var resolvers = container.GetAllInstances<CommandHandlerDelegateResolver>();
@@ -104,7 +104,7 @@ public void ShouldRegisterAllEventHandlersInAssembly()
                 container.RegisterCqrsCore()
                          .RegisterEventHandlers(select => select.ByInterface(Lifestyle.Transient, _handlerAssembly));
 
-                container.RegisterSingleton(_outputHelper);
+                container.RegisterInstance(_outputHelper);
                 container.Verify();
 
                 var resolvers = container.GetAllInstances<EventHandlerDelegateResolver>();
@@ -123,7 +123,7 @@ public void ShouldRegisterAllEventHandlerAttributesInAssembly()
                 container.RegisterCqrsCore()
                          .RegisterEventHandlers(select => select.ByAttribute(Lifestyle.Transient, _handlerAssembly));
 
-                container.RegisterSingleton(_outputHelper);
+                container.RegisterInstance(_outputHelper);
                 container.Verify();
 
                 var resolvers = container.GetAllInstances<EventHandlerDelegateResolver>();

Tests/Xer.Cqrs.Extensions.SimpleInjector.Tests/SimpleInjectorContainerExtensionsTests.cs

@@ -7,12 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="5.1.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="SimpleInjector" Version="4.0.12" />
-    <PackageReference Include="Xer.Cqrs.CommandStack" Version="0.2.3" />
-    <PackageReference Include="Xer.Cqrs.EventStack" Version="0.2.3" />
-    <PackageReference Include="Xer.Delegator" Version="0.3.0" />
+    <PackageReference Include="FluentAssertions" Version="5.2.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" />

Tests/Xer.Cqrs.Extensions.SimpleInjector.Tests/Xer.Cqrs.Extensions.SimpleInjector.Tests.csproj

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.26.1" />
+</packages>