Merge pull request #77 from stoveproject/dev

dev to master
stoveproject · Oct 1, 2017 · 1601d7e · 1601d7e
2 parents 52f8664 + 688eca5
commit 1601d7e
Show file tree

Hide file tree

Showing 72 changed files with 119 additions and 105 deletions.
diff --git a/common.props b/common.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.0.1</VersionPrefix>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <PackageIconUrl>https://raw.githubusercontent.com/osoykan/Stove/master/stove.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/osoykan/Stove</PackageProjectUrl>
@@ -22,6 +22,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.3.1" PrivateAssets="All" />
+    <PackageReference Include="SourceLink.Create.CommandLine" Version="2.4.0" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/...pper/DapperAutoRepositoryTypeAttribute.cs → ...pper/DapperAutoRepositoryTypeAttribute.cs b/...pper/DapperAutoRepositoryTypeAttribute.cs → ...pper/DapperAutoRepositoryTypeAttribute.cs
@@ -4,7 +4,7 @@
 
 using Stove.Domain.Repositories;
 
-namespace Stove
+namespace Stove.Dapper
 {
     public class DapperAutoRepositoryTypeAttribute : AutoRepositoryTypesAttribute
     {

diff --git a/src/Stove.Dapper/StoveDapperBootstrapper.cs → ....Dapper/Dapper/StoveDapperBootstrapper.cs b/src/Stove.Dapper/StoveDapperBootstrapper.cs → ....Dapper/Dapper/StoveDapperBootstrapper.cs
@@ -1,6 +1,6 @@
 using Stove.Bootstrapping;
 
-namespace Stove
+namespace Stove.Dapper
 {
     [DependsOn(
         typeof(StoveKernelBootstrapper)

diff --git a/...pper/StoveDapperRegistrationExtensions.cs → ...pper/StoveDapperRegistrationExtensions.cs b/...pper/StoveDapperRegistrationExtensions.cs → ...pper/StoveDapperRegistrationExtensions.cs
@@ -6,11 +6,10 @@
 
 using JetBrains.Annotations;
 
-using Stove.Dapper;
 using Stove.Extensions;
 using Stove.Orm;
 
-namespace Stove
+namespace Stove.Dapper
 {
     public static class StoveDapperRegistrationExtensions
     {

diff --git a/src/Stove.EntityFramework.Common/StoveEntityFrameworkCommonRegistrationExtensions.cs b/src/Stove.EntityFramework.Common/StoveEntityFrameworkCommonRegistrationExtensions.cs
@@ -3,7 +3,6 @@
 using JetBrains.Annotations;
 
 using Stove.Domain.Uow;
-using Stove.EntityFramework.Uow;
 using Stove.Reflection.Extensions;
 
 namespace Stove.EntityFramework

diff --git a/src/Stove.EntityFramework.Common/TypedConnectionStringResolver.cs b/src/Stove.EntityFramework.Common/TypedConnectionStringResolver.cs
@@ -3,7 +3,7 @@
 using Stove.Configuration;
 using Stove.Domain.Uow;
 
-namespace Stove.EntityFramework.Uow
+namespace Stove.EntityFramework
 {
     public class TypedConnectionStringResolver : IConnectionStringResolver
     {

diff --git a/...ework/StoveEntityFrameworkBootstrapper.cs → ...ework/StoveEntityFrameworkBootstrapper.cs b/...ework/StoveEntityFrameworkBootstrapper.cs → ...ework/StoveEntityFrameworkBootstrapper.cs
@@ -2,9 +2,8 @@
 using System.Linq;
 
 using Stove.Bootstrapping;
-using Stove.EntityFramework;
 
-namespace Stove
+namespace Stove.EntityFramework
 {
 	[DependsOn(
 		typeof(StoveKernelBootstrapper)

diff --git a/...eEntityFrameworkRegistrationExtensions.cs → ...eEntityFrameworkRegistrationExtensions.cs b/...eEntityFrameworkRegistrationExtensions.cs → ...eEntityFrameworkRegistrationExtensions.cs
@@ -7,11 +7,10 @@
 
 using Stove.Domain.Entities;
 using Stove.Domain.Uow;
-using Stove.EntityFramework;
 using Stove.EntityFramework.Uow;
 using Stove.Orm;
 
-namespace Stove
+namespace Stove.EntityFramework
 {
 	public static class StoveEntityFrameworkRegistrationExtensions
 	{

diff --git a/src/Stove.EntityFramework/Stove.EntityFramework.csproj b/src/Stove.EntityFramework/Stove.EntityFramework.csproj
@@ -13,7 +13,6 @@
 
   <PropertyGroup>
     <DocumentationFile>bin\Release\net461\Stove.EntityFramework.xml</DocumentationFile>
-    <DocumentationFile>bin\Release\netstandard2.0\Stove.EntityFramework.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...e/StoveEntityFrameworkCoreBootstrapper.cs → ...e/StoveEntityFrameworkCoreBootstrapper.cs b/...e/StoveEntityFrameworkCoreBootstrapper.cs → ...e/StoveEntityFrameworkCoreBootstrapper.cs
@@ -4,10 +4,9 @@
 
 using Stove.Bootstrapping;
 using Stove.EntityFramework;
-using Stove.EntityFrameworkCore;
 using Stove.EntityFrameworkCore.Configuration;
 
-namespace Stove
+namespace Stove.EntityFrameworkCore
 {
 	public class StoveEntityFrameworkCoreBootstrapper : StoveBootstrapper
 	{

diff --git a/...ityFrameworkCoreRegistrationExtensions.cs → ...ityFrameworkCoreRegistrationExtensions.cs b/...ityFrameworkCoreRegistrationExtensions.cs → ...ityFrameworkCoreRegistrationExtensions.cs
@@ -10,13 +10,12 @@
 using Stove.Domain.Entities;
 using Stove.Domain.Uow;
 using Stove.EntityFramework;
-using Stove.EntityFrameworkCore;
 using Stove.EntityFrameworkCore.Configuration;
 using Stove.EntityFrameworkCore.Uow;
 using Stove.Orm;
 using Stove.Reflection.Extensions;
 
-namespace Stove
+namespace Stove.EntityFrameworkCore
 {
     public static class StoveEntityFrameworkCoreRegistrationExtensions
     {

diff --git a/...igurations/IStoveHangfireConfiguration.cs → ...igurations/IStoveHangfireConfiguration.cs b/...igurations/IStoveHangfireConfiguration.cs → ...igurations/IStoveHangfireConfiguration.cs
@@ -2,7 +2,7 @@
 
 using Stove.Configuration;
 
-namespace Stove.Configurations
+namespace Stove.Hangfire.Configurations
 {
     public interface IStoveHangfireConfiguration
     {

diff --git a/...figurations/StoveHangFireConfiguration.cs → ...figurations/StoveHangFireConfiguration.cs b/...figurations/StoveHangFireConfiguration.cs → ...figurations/StoveHangFireConfiguration.cs
@@ -4,7 +4,7 @@
 
 using Stove.Configuration;
 
-namespace Stove.Configurations
+namespace Stove.Hangfire.Configurations
 {
     public class StoveHangfireConfiguration : IStoveHangfireConfiguration, ISingletonDependency
     {

diff --git a/...s/StoveHangfireConfigurationExtensions.cs → ...s/StoveHangfireConfigurationExtensions.cs b/...s/StoveHangfireConfigurationExtensions.cs → ...s/StoveHangfireConfigurationExtensions.cs
@@ -3,9 +3,8 @@
 using JetBrains.Annotations;
 
 using Stove.Configuration;
-using Stove.Hangfire;
 
-namespace Stove.Configurations
+namespace Stove.Hangfire.Configurations
 {
     public static class StoveHangfireConfigurationExtensions
     {

diff --git a/src/Stove.HangFire/Hangfire/HangfireBackgroundJobManager.cs b/src/Stove.HangFire/Hangfire/HangfireBackgroundJobManager.cs
@@ -6,7 +6,7 @@
 using Hangfire;
 
 using Stove.BackgroundJobs;
-using Stove.Configurations;
+using Stove.Hangfire.Configurations;
 using Stove.Threading.BackgrodunWorkers;
 
 namespace Stove.Hangfire

diff --git a/src/Stove.HangFire/Hangfire/HangfireScheduleJobManager.cs b/src/Stove.HangFire/Hangfire/HangfireScheduleJobManager.cs
@@ -6,7 +6,7 @@
 using Hangfire;
 
 using Stove.BackgroundJobs;
-using Stove.Configurations;
+using Stove.Hangfire.Configurations;
 using Stove.Threading.BackgrodunWorkers;
 
 namespace Stove.Hangfire

diff --git a/...ove.HangFire/StoveHangFireBootstrapper.cs → ...ire/Hangfire/StoveHangFireBootstrapper.cs b/...ove.HangFire/StoveHangFireBootstrapper.cs → ...ire/Hangfire/StoveHangFireBootstrapper.cs
@@ -1,11 +1,10 @@
 using Autofac;
 
 using Stove.Bootstrapping;
-using Stove.Configurations;
-using Stove.Hangfire;
+using Stove.Hangfire.Configurations;
 using Stove.Threading.BackgrodunWorkers;
 
-namespace Stove
+namespace Stove.Hangfire
 {
     [DependsOn(
         typeof(StoveKernelBootstrapper)

diff --git a/...re/StoveHangfireRegistrationExtensions.cs → ...re/StoveHangfireRegistrationExtensions.cs b/...re/StoveHangfireRegistrationExtensions.cs → ...re/StoveHangfireRegistrationExtensions.cs
@@ -1,14 +1,13 @@
 using System;
-using System.Reflection;
 
 using Autofac.Extras.IocManager;
 
 using JetBrains.Annotations;
 
-using Stove.Configurations;
+using Stove.Hangfire.Configurations;
 using Stove.Reflection.Extensions;
 
-namespace Stove
+namespace Stove.Hangfire
 {
     public static class StoveHangfireRegistrationExtensions
     {

diff --git a/...Stove.Mapster/StoveMapsterBootstrapper.cs → ...pster/Mapster/StoveMapsterBootstrapper.cs b/...Stove.Mapster/StoveMapsterBootstrapper.cs → ...pster/Mapster/StoveMapsterBootstrapper.cs
@@ -4,10 +4,9 @@
 using Mapster;
 
 using Stove.Bootstrapping;
-using Stove.Mapster;
 using Stove.Reflection;
 
-namespace Stove
+namespace Stove.Mapster
 {
     [DependsOn(
         typeof(StoveKernelBootstrapper)

diff --git a/...ter/StoveMapsterRegistrationExtensions.cs → ...ter/StoveMapsterRegistrationExtensions.cs b/...ter/StoveMapsterRegistrationExtensions.cs → ...ter/StoveMapsterRegistrationExtensions.cs
@@ -1,14 +1,11 @@
-using System.Reflection;
-
-using Autofac.Extras.IocManager;
+using Autofac.Extras.IocManager;
 
 using JetBrains.Annotations;
 
-using Stove.Mapster;
 using Stove.ObjectMapping;
 using Stove.Reflection.Extensions;
 
-namespace Stove
+namespace Stove.Mapster
 {
     public static class StoveMapsterRegistrationExtensions
     {

diff --git a/src/Stove.Mapster/Stove.Mapster.csproj b/src/Stove.Mapster/Stove.Mapster.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Mapster" Version="3.1.3" />
+    <PackageReference Include="Mapster" Version="3.1.4" />
   </ItemGroup>
 
 </Project>
diff --git a/...guration/IStoveNHibernateConfiguration.cs → ...guration/IStoveNHibernateConfiguration.cs b/...guration/IStoveNHibernateConfiguration.cs → ...guration/IStoveNHibernateConfiguration.cs
@@ -1,6 +1,8 @@
 using FluentNHibernate.Cfg;
 
-namespace Stove.Configuration
+using Stove.Configuration;
+
+namespace Stove.NHibernate.Configuration
 {
     public interface IStoveNHibernateConfiguration
     {

diff --git a/...iguration/StoveNHibernateConfiguration.cs → ...iguration/StoveNHibernateConfiguration.cs b/...iguration/StoveNHibernateConfiguration.cs → ...iguration/StoveNHibernateConfiguration.cs
@@ -2,7 +2,9 @@
 
 using FluentNHibernate.Cfg;
 
-namespace Stove.Configuration
+using Stove.Configuration;
+
+namespace Stove.NHibernate.Configuration
 {
     public class StoveNHibernateConfiguration : IStoveNHibernateConfiguration, ISingletonDependency
     {

diff --git a/...StoveNHibernateConfigurationExtensions.cs → ...StoveNHibernateConfigurationExtensions.cs b/...StoveNHibernateConfigurationExtensions.cs → ...StoveNHibernateConfigurationExtensions.cs
@@ -1,4 +1,6 @@
-namespace Stove.Configuration
+using Stove.Configuration;
+
+namespace Stove.NHibernate.Configuration
 {
     public static class StoveNHibernateConfigurationExtensions
     {

diff --git a/src/Stove.NHibernate/ISessionProvider.cs → ...NHibernate/NHibernate/ISessionProvider.cs b/src/Stove.NHibernate/ISessionProvider.cs → ...NHibernate/NHibernate/ISessionProvider.cs
@@ -1,6 +1,6 @@
 using NHibernate;
 
-namespace Stove
+namespace Stove.NHibernate
 {
     public interface ISessionProvider
     {

diff --git a/...NHibernate/StoveNHibernateBootstrapper.cs → ...NHibernate/StoveNHibernateBootstrapper.cs b/...NHibernate/StoveNHibernateBootstrapper.cs → ...NHibernate/StoveNHibernateBootstrapper.cs
@@ -1,6 +1,6 @@
-using Stove.Bootstrapping;
+using Stove.Bootstrapping;
 
-namespace Stove
+namespace Stove.NHibernate
 {
     [DependsOn(typeof(StoveKernelBootstrapper))]
     public class StoveNHibernateBootstrapper : StoveBootstrapper

diff --git a/.../StoveNHibernateRegistrationExtensions.cs → .../StoveNHibernateRegistrationExtensions.cs b/.../StoveNHibernateRegistrationExtensions.cs → .../StoveNHibernateRegistrationExtensions.cs
@@ -6,12 +6,12 @@
 
 using Stove.Configuration;
 using Stove.Domain.Repositories;
-using Stove.NHibernate;
+using Stove.NHibernate.Configuration;
 using Stove.NHibernate.Interceptors;
 using Stove.NHibernate.Repositories;
 using Stove.Orm;
 
-namespace Stove
+namespace Stove.NHibernate
 {
     public static class StoveNHibernateRegistrationExtensions
     {

diff --git a/src/Stove.NHibernate/Stove.NHibernate.csproj b/src/Stove.NHibernate/Stove.NHibernate.csproj
@@ -14,7 +14,6 @@
 
   <PropertyGroup>
     <DocumentationFile>bin\Release\net461\Stove.NHibernate.xml</DocumentationFile>
-    <DocumentationFile>bin\Release\netstandard2.0\Stove.NHibernate.xml</DocumentationFile>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Stove.NLog/NLogRegistrarModule.cs → src/Stove.NLog/NLog/NLogRegistrarModule.cs b/src/Stove.NLog/NLogRegistrarModule.cs → src/Stove.NLog/NLog/NLogRegistrarModule.cs
@@ -10,7 +10,7 @@
 using ILogger = Stove.Log.ILogger;
 using Module = Autofac.Module;
 
-namespace Stove
+namespace Stove.NLog
 {
 	public class NLogRegistrarModule : Module
 	{

diff --git a/src/Stove.NLog/StoveNLogBootstrapper.cs → src/Stove.NLog/NLog/StoveNLogBootstrapper.cs b/src/Stove.NLog/StoveNLogBootstrapper.cs → src/Stove.NLog/NLog/StoveNLogBootstrapper.cs
@@ -1,6 +1,6 @@
 using Stove.Bootstrapping;
 
-namespace Stove
+namespace Stove.NLog
 {
     [DependsOn(
         typeof(StoveKernelBootstrapper)

diff --git a/src/Stove.NLog/StoveNLogLogger.cs → src/Stove.NLog/NLog/StoveNLogLogger.cs b/src/Stove.NLog/StoveNLogLogger.cs → src/Stove.NLog/NLog/StoveNLogLogger.cs
@@ -4,7 +4,7 @@
 
 using ILogger = Stove.Log.ILogger;
 
-namespace Stove
+namespace Stove.NLog
 {
 	/// <summary>
 	///     Implementation of ILogger, deriving from NLog.Logger

diff --git a/...e.NLog/StoveNLogRegistrationExtensions.cs → ...g/NLog/StoveNLogRegistrationExtensions.cs b/...e.NLog/StoveNLogRegistrationExtensions.cs → ...g/NLog/StoveNLogRegistrationExtensions.cs
@@ -9,7 +9,7 @@
 
 using ILogger = Stove.Log.ILogger;
 
-namespace Stove
+namespace Stove.NLog
 {
 	public static class StoveNLogRegistrationExtensions
 	{

diff --git a/src/Stove.NLog/Stove.NLog.csproj b/src/Stove.NLog/Stove.NLog.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.0-beta10" />
+    <PackageReference Include="NLog" Version="5.0.0-beta11" />
   </ItemGroup>
 
 </Project>
diff --git a/...ove.RabbitMQ/StoveRabbitMQBootstrapper.cs → ...tMQ/RabbitMQ/StoveRabbitMQBootstrapper.cs b/...ove.RabbitMQ/StoveRabbitMQBootstrapper.cs → ...tMQ/RabbitMQ/StoveRabbitMQBootstrapper.cs
@@ -3,9 +3,8 @@
 using MassTransit;
 
 using Stove.Bootstrapping;
-using Stove.RabbitMQ;
 
-namespace Stove
+namespace Stove.RabbitMQ
 {
     [DependsOn(
         typeof(StoveKernelBootstrapper)

diff --git a/...MQ/StoveRabbitMQRegistrationExtensions.cs → ...MQ/StoveRabbitMQRegistrationExtensions.cs b/...MQ/StoveRabbitMQRegistrationExtensions.cs → ...MQ/StoveRabbitMQRegistrationExtensions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 using Autofac;
 using Autofac.Extras.IocManager;
@@ -11,10 +11,9 @@
 using MassTransit.RabbitMqTransport;
 
 using Stove.MQ;
-using Stove.RabbitMQ;
 using Stove.Reflection.Extensions;
 
-namespace Stove
+namespace Stove.RabbitMQ
 {
 	public static class StoveRabbitMQRegistrationExtensions
 	{

diff --git a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj
@@ -27,9 +27,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MassTransit" Version="4.0.0.1288-develop" />
-    <PackageReference Include="MassTransit.Autofac" Version="4.0.0.1288-develop" />
-    <PackageReference Include="MassTransit.RabbitMQ" Version="4.0.0.1288-develop" />
+    <PackageReference Include="MassTransit" Version="4.0.0.1305-develop" />
+    <PackageReference Include="MassTransit.Autofac" Version="4.0.0.1305-develop" />
+    <PackageReference Include="MassTransit.RabbitMQ" Version="4.0.0.1305-develop" />
   </ItemGroup>
 
 </Project>