From 62102815efadd1d363bd34733f29ae6e9124b404 Mon Sep 17 00:00:00 2001 From: osoykan Date: Tue, 26 Sep 2017 21:02:54 +0300 Subject: [PATCH 1/6] RabbitMQ packages updated --- src/Stove.RabbitMQ/Stove.RabbitMQ.csproj | 6 +++--- test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj | 2 +- .../Stove.EntityFrameworkCore.Dapper.Tests.csproj | 2 +- .../Stove.EntityFrameworkCore.Tests.csproj | 2 +- test/Stove.Hangfire.Tests/Stove.Hangfire.Tests.csproj | 2 +- test/Stove.Mapster.Tests/Stove.Mapster.Tests.csproj | 2 +- test/Stove.NLog.Tests/Stove.NLog.Tests.csproj | 2 +- test/Stove.RabbitMQ.Tests/Stove.RabbitMQ.Tests.csproj | 2 +- test/Stove.Redis.Tests/Stove.Redis.Tests.csproj | 2 +- test/Stove.Serilog.Tests/Stove.Serilog.Tests.csproj | 2 +- test/Stove.Tests/Stove.Tests.csproj | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj index 1858691..31049b3 100644 --- a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj +++ b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj index e137a8a..fb12a12 100644 --- a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj +++ b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Stove.EntityFrameworkCore.Dapper.Tests/Stove.EntityFrameworkCore.Dapper.Tests.csproj b/test/Stove.EntityFrameworkCore.Dapper.Tests/Stove.EntityFrameworkCore.Dapper.Tests.csproj index f0eaad4..45441eb 100644 --- a/test/Stove.EntityFrameworkCore.Dapper.Tests/Stove.EntityFrameworkCore.Dapper.Tests.csproj +++ b/test/Stove.EntityFrameworkCore.Dapper.Tests/Stove.EntityFrameworkCore.Dapper.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/Stove.EntityFrameworkCore.Tests/Stove.EntityFrameworkCore.Tests.csproj b/test/Stove.EntityFrameworkCore.Tests/Stove.EntityFrameworkCore.Tests.csproj index 980e6ce..9d6f2cf 100644 --- a/test/Stove.EntityFrameworkCore.Tests/Stove.EntityFrameworkCore.Tests.csproj +++ b/test/Stove.EntityFrameworkCore.Tests/Stove.EntityFrameworkCore.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Stove.Hangfire.Tests/Stove.Hangfire.Tests.csproj b/test/Stove.Hangfire.Tests/Stove.Hangfire.Tests.csproj index 257146b..876ba44 100644 --- a/test/Stove.Hangfire.Tests/Stove.Hangfire.Tests.csproj +++ b/test/Stove.Hangfire.Tests/Stove.Hangfire.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/Stove.Mapster.Tests/Stove.Mapster.Tests.csproj b/test/Stove.Mapster.Tests/Stove.Mapster.Tests.csproj index e3cd9b1..26e4e01 100644 --- a/test/Stove.Mapster.Tests/Stove.Mapster.Tests.csproj +++ b/test/Stove.Mapster.Tests/Stove.Mapster.Tests.csproj @@ -18,7 +18,7 @@ - + diff --git a/test/Stove.NLog.Tests/Stove.NLog.Tests.csproj b/test/Stove.NLog.Tests/Stove.NLog.Tests.csproj index f2d3a2c..e5f9065 100644 --- a/test/Stove.NLog.Tests/Stove.NLog.Tests.csproj +++ b/test/Stove.NLog.Tests/Stove.NLog.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Stove.RabbitMQ.Tests/Stove.RabbitMQ.Tests.csproj b/test/Stove.RabbitMQ.Tests/Stove.RabbitMQ.Tests.csproj index 5ca6ead..317a762 100644 --- a/test/Stove.RabbitMQ.Tests/Stove.RabbitMQ.Tests.csproj +++ b/test/Stove.RabbitMQ.Tests/Stove.RabbitMQ.Tests.csproj @@ -17,7 +17,7 @@ - + diff --git a/test/Stove.Redis.Tests/Stove.Redis.Tests.csproj b/test/Stove.Redis.Tests/Stove.Redis.Tests.csproj index 15a7c35..bdbb874 100644 --- a/test/Stove.Redis.Tests/Stove.Redis.Tests.csproj +++ b/test/Stove.Redis.Tests/Stove.Redis.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Stove.Serilog.Tests/Stove.Serilog.Tests.csproj b/test/Stove.Serilog.Tests/Stove.Serilog.Tests.csproj index 08e23ed..3e4ed38 100644 --- a/test/Stove.Serilog.Tests/Stove.Serilog.Tests.csproj +++ b/test/Stove.Serilog.Tests/Stove.Serilog.Tests.csproj @@ -11,7 +11,7 @@ - + diff --git a/test/Stove.Tests/Stove.Tests.csproj b/test/Stove.Tests/Stove.Tests.csproj index b5905da..891238c 100644 --- a/test/Stove.Tests/Stove.Tests.csproj +++ b/test/Stove.Tests/Stove.Tests.csproj @@ -11,7 +11,7 @@ - + From ad9d522b76f49a7757a785df14eeb7298e6bd21c Mon Sep 17 00:00:00 2001 From: osoykan Date: Wed, 27 Sep 2017 20:00:32 +0300 Subject: [PATCH 2/6] nlog updated --- common.props | 2 +- src/Stove.NLog/Stove.NLog.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common.props b/common.props index edca931..0561478 100644 --- a/common.props +++ b/common.props @@ -22,6 +22,6 @@ - + diff --git a/src/Stove.NLog/Stove.NLog.csproj b/src/Stove.NLog/Stove.NLog.csproj index 737df75..097024f 100644 --- a/src/Stove.NLog/Stove.NLog.csproj +++ b/src/Stove.NLog/Stove.NLog.csproj @@ -27,7 +27,7 @@ - + From 750494bb21d646a6f555539ada4f3d4032e4677e Mon Sep 17 00:00:00 2001 From: osoykan Date: Fri, 29 Sep 2017 00:19:14 +0300 Subject: [PATCH 3/6] rabbitmq updated --- src/Stove.RabbitMQ/Stove.RabbitMQ.csproj | 6 +++--- test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj index 31049b3..7666a59 100644 --- a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj +++ b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj index fb12a12..0cbb429 100644 --- a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj +++ b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj @@ -12,7 +12,7 @@ - + From a77fcce45865be03a69df9b3b70fc47e4237f480 Mon Sep 17 00:00:00 2001 From: osoykan Date: Fri, 29 Sep 2017 23:36:03 +0300 Subject: [PATCH 4/6] references are cleaned --- src/Stove/Stove.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Stove/Stove.csproj b/src/Stove/Stove.csproj index 04f838a..1f9ebdf 100644 --- a/src/Stove/Stove.csproj +++ b/src/Stove/Stove.csproj @@ -22,10 +22,8 @@ - - From 4585fc2cf3f510b9ea87d937cba8d93d16926d99 Mon Sep 17 00:00:00 2001 From: osoykan Date: Sun, 1 Oct 2017 16:19:43 +0300 Subject: [PATCH 5/6] namepsacing refactor --- .../{ => Dapper}/DapperAutoRepositoryTypeAttribute.cs | 2 +- src/Stove.Dapper/{ => Dapper}/StoveDapperBootstrapper.cs | 2 +- .../{ => Dapper}/StoveDapperRegistrationExtensions.cs | 3 +-- .../StoveEntityFrameworkCommonRegistrationExtensions.cs | 1 - .../TypedConnectionStringResolver.cs | 2 +- .../StoveEntityFrameworkBootstrapper.cs | 3 +-- .../StoveEntityFrameworkRegistrationExtensions.cs | 3 +-- src/Stove.EntityFramework/Stove.EntityFramework.csproj | 1 - .../StoveEntityFrameworkCoreBootstrapper.cs | 3 +-- .../StoveEntityFrameworkCoreRegistrationExtensions.cs | 3 +-- .../Configurations/IStoveHangfireConfiguration.cs | 2 +- .../Configurations/StoveHangFireConfiguration.cs | 2 +- .../Configurations/StoveHangfireConfigurationExtensions.cs | 3 +-- .../Hangfire/HangfireBackgroundJobManager.cs | 2 +- src/Stove.HangFire/Hangfire/HangfireScheduleJobManager.cs | 2 +- .../{ => Hangfire}/StoveHangFireBootstrapper.cs | 5 ++--- .../{ => Hangfire}/StoveHangfireRegistrationExtensions.cs | 5 ++--- .../{ => Mapster}/StoveMapsterBootstrapper.cs | 3 +-- .../{ => Mapster}/StoveMapsterRegistrationExtensions.cs | 7 ++----- src/Stove.Mapster/Stove.Mapster.csproj | 2 +- .../Configuration/IStoveNHibernateConfiguration.cs | 4 +++- .../Configuration/StoveNHibernateConfiguration.cs | 4 +++- .../StoveNHibernateConfigurationExtensions.cs | 4 +++- src/Stove.NHibernate/{ => NHibernate}/ISessionProvider.cs | 2 +- .../{ => NHibernate}/StoveNHibernateBootstrapper.cs | 4 ++-- .../StoveNHibernateRegistrationExtensions.cs | 4 ++-- src/Stove.NHibernate/Stove.NHibernate.csproj | 1 - src/Stove.NLog/{ => NLog}/NLogRegistrarModule.cs | 2 +- src/Stove.NLog/{ => NLog}/StoveNLogBootstrapper.cs | 2 +- src/Stove.NLog/{ => NLog}/StoveNLogLogger.cs | 2 +- .../{ => NLog}/StoveNLogRegistrationExtensions.cs | 2 +- .../{ => RabbitMQ}/StoveRabbitMQBootstrapper.cs | 3 +-- .../{ => RabbitMQ}/StoveRabbitMQRegistrationExtensions.cs | 5 ++--- src/Stove.RabbitMQ/Stove.RabbitMQ.csproj | 6 +++--- src/Stove.RavenDB/{ => RavenDB}/ISessionProvider.cs | 5 ++--- .../{ => RavenDB}/StoveRavenDBBootstrapper.cs | 5 ++--- .../{ => RavenDB}/StoveRavenDBRegistrationExtensions.cs | 4 ++-- src/Stove.Redis/{ => Redis}/StoveRedisBootstrapper.cs | 2 +- .../{ => Redis}/StoveRedisRegistrationExtensions.cs | 5 ++--- src/Stove.Serilog/Serilog/SerilogRegistrarModule.cs | 3 +-- .../{ => Serilog}/StoveSerilogBootstrapper.cs | 2 +- .../{ => Serilog}/StoveSerilogRegistrationExtensions.cs | 3 +-- test/Stove.Dapper.Tests/StoveDapperTestBootstrapper.cs | 1 + test/Stove.Demo.ConsoleApp.Nh/Program.cs | 3 +++ test/Stove.Demo.ConsoleApp.Nh/StoveDemoBootstrapper.cs | 2 ++ test/Stove.Demo.ConsoleApp.RavenDB/Program.cs | 2 ++ .../StoveRavenDBDemoBootstrapper.cs | 1 + test/Stove.Demo.ConsoleApp/Program.cs | 6 ++++++ test/Stove.Demo.ConsoleApp/StoveDemoBootstrapper.cs | 6 ++++++ test/Stove.Demo.WebApi.Core/Startup.cs | 7 +++++++ test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj | 2 +- test/Stove.Demo.WebApi.Core/StoveWebApiCoreBootstrapper.cs | 6 ++++++ test/Stove.Demo.WebApi/Startup.cs | 3 +++ test/Stove.Demo.WebApi/StoveDemoWebApiBootstapper.cs | 2 ++ .../StoveEfCoreDapperTestApplicationBase.cs | 1 + .../StoveEfCoreDapperTestBootstrapper.cs | 1 + .../General_Repository_With_Dapper_Tests.cs | 1 + .../SampleApplicationBootstrapper.cs | 1 + .../SampleApplicationTestBase.cs | 2 ++ 59 files changed, 103 insertions(+), 74 deletions(-) rename src/Stove.Dapper/{ => Dapper}/DapperAutoRepositoryTypeAttribute.cs (96%) rename src/Stove.Dapper/{ => Dapper}/StoveDapperBootstrapper.cs (88%) rename src/Stove.Dapper/{ => Dapper}/StoveDapperRegistrationExtensions.cs (98%) rename src/Stove.EntityFramework/{ => EntityFramework}/StoveEntityFrameworkBootstrapper.cs (93%) rename src/Stove.EntityFramework/{ => EntityFramework}/StoveEntityFrameworkRegistrationExtensions.cs (98%) rename src/Stove.EntityFrameworkCore/{ => EntityFrameworkCore}/StoveEntityFrameworkCoreBootstrapper.cs (94%) rename src/Stove.EntityFrameworkCore/{ => EntityFrameworkCore}/StoveEntityFrameworkCoreRegistrationExtensions.cs (98%) rename src/Stove.HangFire/{ => Hangfire}/Configurations/IStoveHangfireConfiguration.cs (87%) rename src/Stove.HangFire/{ => Hangfire}/Configurations/StoveHangFireConfiguration.cs (93%) rename src/Stove.HangFire/{ => Hangfire}/Configurations/StoveHangfireConfigurationExtensions.cs (92%) rename src/Stove.HangFire/{ => Hangfire}/StoveHangFireBootstrapper.cs (94%) rename src/Stove.HangFire/{ => Hangfire}/StoveHangfireRegistrationExtensions.cs (92%) rename src/Stove.Mapster/{ => Mapster}/StoveMapsterBootstrapper.cs (97%) rename src/Stove.Mapster/{ => Mapster}/StoveMapsterRegistrationExtensions.cs (89%) rename src/Stove.NHibernate/{ => NHibernate}/Configuration/IStoveNHibernateConfiguration.cs (86%) rename src/Stove.NHibernate/{ => NHibernate}/Configuration/StoveNHibernateConfiguration.cs (88%) rename src/Stove.NHibernate/{ => NHibernate}/Configuration/StoveNHibernateConfigurationExtensions.cs (80%) rename src/Stove.NHibernate/{ => NHibernate}/ISessionProvider.cs (90%) rename src/Stove.NHibernate/{ => NHibernate}/StoveNHibernateBootstrapper.cs (70%) rename src/Stove.NHibernate/{ => NHibernate}/StoveNHibernateRegistrationExtensions.cs (96%) rename src/Stove.NLog/{ => NLog}/NLogRegistrarModule.cs (98%) rename src/Stove.NLog/{ => NLog}/StoveNLogBootstrapper.cs (88%) rename src/Stove.NLog/{ => NLog}/StoveNLogLogger.cs (99%) rename src/Stove.NLog/{ => NLog}/StoveNLogRegistrationExtensions.cs (97%) rename src/Stove.RabbitMQ/{ => RabbitMQ}/StoveRabbitMQBootstrapper.cs (95%) rename src/Stove.RabbitMQ/{ => RabbitMQ}/StoveRabbitMQRegistrationExtensions.cs (97%) rename src/Stove.RavenDB/{ => RavenDB}/ISessionProvider.cs (55%) rename src/Stove.RavenDB/{ => RavenDB}/StoveRavenDBBootstrapper.cs (90%) rename src/Stove.RavenDB/{ => RavenDB}/StoveRavenDBRegistrationExtensions.cs (96%) rename src/Stove.Redis/{ => Redis}/StoveRedisBootstrapper.cs (95%) rename src/Stove.Redis/{ => Redis}/StoveRedisRegistrationExtensions.cs (96%) rename src/Stove.Serilog/{ => Serilog}/StoveSerilogBootstrapper.cs (86%) rename src/Stove.Serilog/{ => Serilog}/StoveSerilogRegistrationExtensions.cs (95%) diff --git a/src/Stove.Dapper/DapperAutoRepositoryTypeAttribute.cs b/src/Stove.Dapper/Dapper/DapperAutoRepositoryTypeAttribute.cs similarity index 96% rename from src/Stove.Dapper/DapperAutoRepositoryTypeAttribute.cs rename to src/Stove.Dapper/Dapper/DapperAutoRepositoryTypeAttribute.cs index b4257ec..f101997 100644 --- a/src/Stove.Dapper/DapperAutoRepositoryTypeAttribute.cs +++ b/src/Stove.Dapper/Dapper/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 b/src/Stove.Dapper/Dapper/StoveDapperBootstrapper.cs similarity index 88% rename from src/Stove.Dapper/StoveDapperBootstrapper.cs rename to src/Stove.Dapper/Dapper/StoveDapperBootstrapper.cs index ff3ddf3..a4619d5 100644 --- a/src/Stove.Dapper/StoveDapperBootstrapper.cs +++ b/src/Stove.Dapper/Dapper/StoveDapperBootstrapper.cs @@ -1,6 +1,6 @@ using Stove.Bootstrapping; -namespace Stove +namespace Stove.Dapper { [DependsOn( typeof(StoveKernelBootstrapper) diff --git a/src/Stove.Dapper/StoveDapperRegistrationExtensions.cs b/src/Stove.Dapper/Dapper/StoveDapperRegistrationExtensions.cs similarity index 98% rename from src/Stove.Dapper/StoveDapperRegistrationExtensions.cs rename to src/Stove.Dapper/Dapper/StoveDapperRegistrationExtensions.cs index bcc7ffe..2be970f 100644 --- a/src/Stove.Dapper/StoveDapperRegistrationExtensions.cs +++ b/src/Stove.Dapper/Dapper/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 index 6648afc..edc112f 100644 --- 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 index 5c640ea..b31302f 100644 --- 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/src/Stove.EntityFramework/StoveEntityFrameworkBootstrapper.cs b/src/Stove.EntityFramework/EntityFramework/StoveEntityFrameworkBootstrapper.cs similarity index 93% rename from src/Stove.EntityFramework/StoveEntityFrameworkBootstrapper.cs rename to src/Stove.EntityFramework/EntityFramework/StoveEntityFrameworkBootstrapper.cs index d9c43c6..4caaef7 100644 --- a/src/Stove.EntityFramework/StoveEntityFrameworkBootstrapper.cs +++ b/src/Stove.EntityFramework/EntityFramework/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/src/Stove.EntityFramework/StoveEntityFrameworkRegistrationExtensions.cs b/src/Stove.EntityFramework/EntityFramework/StoveEntityFrameworkRegistrationExtensions.cs similarity index 98% rename from src/Stove.EntityFramework/StoveEntityFrameworkRegistrationExtensions.cs rename to src/Stove.EntityFramework/EntityFramework/StoveEntityFrameworkRegistrationExtensions.cs index 2e7390c..1a6f0d6 100644 --- a/src/Stove.EntityFramework/StoveEntityFrameworkRegistrationExtensions.cs +++ b/src/Stove.EntityFramework/EntityFramework/StoveEntityFrameworkRegistrationExtensions.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 index fafb20d..1ca5618 100644 --- a/src/Stove.EntityFramework/Stove.EntityFramework.csproj +++ b/src/Stove.EntityFramework/Stove.EntityFramework.csproj @@ -13,7 +13,6 @@ bin\Release\net461\Stove.EntityFramework.xml - bin\Release\netstandard2.0\Stove.EntityFramework.xml diff --git a/src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreBootstrapper.cs b/src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityFrameworkCoreBootstrapper.cs similarity index 94% rename from src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreBootstrapper.cs rename to src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityFrameworkCoreBootstrapper.cs index caa667b..02b56ae 100644 --- a/src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreBootstrapper.cs +++ b/src/Stove.EntityFrameworkCore/EntityFrameworkCore/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/src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.cs b/src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.cs similarity index 98% rename from src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.cs rename to src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.cs index a6aad47..7658d13 100644 --- a/src/Stove.EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.cs +++ b/src/Stove.EntityFrameworkCore/EntityFrameworkCore/StoveEntityFrameworkCoreRegistrationExtensions.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/src/Stove.HangFire/Configurations/IStoveHangfireConfiguration.cs b/src/Stove.HangFire/Hangfire/Configurations/IStoveHangfireConfiguration.cs similarity index 87% rename from src/Stove.HangFire/Configurations/IStoveHangfireConfiguration.cs rename to src/Stove.HangFire/Hangfire/Configurations/IStoveHangfireConfiguration.cs index c81d542..a366969 100644 --- a/src/Stove.HangFire/Configurations/IStoveHangfireConfiguration.cs +++ b/src/Stove.HangFire/Hangfire/Configurations/IStoveHangfireConfiguration.cs @@ -2,7 +2,7 @@ using Stove.Configuration; -namespace Stove.Configurations +namespace Stove.Hangfire.Configurations { public interface IStoveHangfireConfiguration { diff --git a/src/Stove.HangFire/Configurations/StoveHangFireConfiguration.cs b/src/Stove.HangFire/Hangfire/Configurations/StoveHangFireConfiguration.cs similarity index 93% rename from src/Stove.HangFire/Configurations/StoveHangFireConfiguration.cs rename to src/Stove.HangFire/Hangfire/Configurations/StoveHangFireConfiguration.cs index c6f6d55..9e14a44 100644 --- a/src/Stove.HangFire/Configurations/StoveHangFireConfiguration.cs +++ b/src/Stove.HangFire/Hangfire/Configurations/StoveHangFireConfiguration.cs @@ -4,7 +4,7 @@ using Stove.Configuration; -namespace Stove.Configurations +namespace Stove.Hangfire.Configurations { public class StoveHangfireConfiguration : IStoveHangfireConfiguration, ISingletonDependency { diff --git a/src/Stove.HangFire/Configurations/StoveHangfireConfigurationExtensions.cs b/src/Stove.HangFire/Hangfire/Configurations/StoveHangfireConfigurationExtensions.cs similarity index 92% rename from src/Stove.HangFire/Configurations/StoveHangfireConfigurationExtensions.cs rename to src/Stove.HangFire/Hangfire/Configurations/StoveHangfireConfigurationExtensions.cs index 3ed8de5..d08bdc9 100644 --- a/src/Stove.HangFire/Configurations/StoveHangfireConfigurationExtensions.cs +++ b/src/Stove.HangFire/Hangfire/Configurations/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 index 33f2786..33cbe77 100644 --- 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 index 8b2bac8..e570345 100644 --- 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/src/Stove.HangFire/StoveHangFireBootstrapper.cs b/src/Stove.HangFire/Hangfire/StoveHangFireBootstrapper.cs similarity index 94% rename from src/Stove.HangFire/StoveHangFireBootstrapper.cs rename to src/Stove.HangFire/Hangfire/StoveHangFireBootstrapper.cs index 17e4d78..f6f0ae7 100644 --- a/src/Stove.HangFire/StoveHangFireBootstrapper.cs +++ b/src/Stove.HangFire/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/src/Stove.HangFire/StoveHangfireRegistrationExtensions.cs b/src/Stove.HangFire/Hangfire/StoveHangfireRegistrationExtensions.cs similarity index 92% rename from src/Stove.HangFire/StoveHangfireRegistrationExtensions.cs rename to src/Stove.HangFire/Hangfire/StoveHangfireRegistrationExtensions.cs index c682572..5913d5f 100644 --- a/src/Stove.HangFire/StoveHangfireRegistrationExtensions.cs +++ b/src/Stove.HangFire/Hangfire/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/src/Stove.Mapster/StoveMapsterBootstrapper.cs b/src/Stove.Mapster/Mapster/StoveMapsterBootstrapper.cs similarity index 97% rename from src/Stove.Mapster/StoveMapsterBootstrapper.cs rename to src/Stove.Mapster/Mapster/StoveMapsterBootstrapper.cs index 009255c..f3be0a3 100644 --- a/src/Stove.Mapster/StoveMapsterBootstrapper.cs +++ b/src/Stove.Mapster/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/src/Stove.Mapster/StoveMapsterRegistrationExtensions.cs b/src/Stove.Mapster/Mapster/StoveMapsterRegistrationExtensions.cs similarity index 89% rename from src/Stove.Mapster/StoveMapsterRegistrationExtensions.cs rename to src/Stove.Mapster/Mapster/StoveMapsterRegistrationExtensions.cs index 3296aff..bfe638d 100644 --- a/src/Stove.Mapster/StoveMapsterRegistrationExtensions.cs +++ b/src/Stove.Mapster/Mapster/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 index 738aedf..aebb1c1 100644 --- a/src/Stove.Mapster/Stove.Mapster.csproj +++ b/src/Stove.Mapster/Stove.Mapster.csproj @@ -27,7 +27,7 @@ - + diff --git a/src/Stove.NHibernate/Configuration/IStoveNHibernateConfiguration.cs b/src/Stove.NHibernate/NHibernate/Configuration/IStoveNHibernateConfiguration.cs similarity index 86% rename from src/Stove.NHibernate/Configuration/IStoveNHibernateConfiguration.cs rename to src/Stove.NHibernate/NHibernate/Configuration/IStoveNHibernateConfiguration.cs index a9f79fb..bc3e800 100644 --- a/src/Stove.NHibernate/Configuration/IStoveNHibernateConfiguration.cs +++ b/src/Stove.NHibernate/NHibernate/Configuration/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/src/Stove.NHibernate/Configuration/StoveNHibernateConfiguration.cs b/src/Stove.NHibernate/NHibernate/Configuration/StoveNHibernateConfiguration.cs similarity index 88% rename from src/Stove.NHibernate/Configuration/StoveNHibernateConfiguration.cs rename to src/Stove.NHibernate/NHibernate/Configuration/StoveNHibernateConfiguration.cs index 877da3b..8add629 100644 --- a/src/Stove.NHibernate/Configuration/StoveNHibernateConfiguration.cs +++ b/src/Stove.NHibernate/NHibernate/Configuration/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/src/Stove.NHibernate/Configuration/StoveNHibernateConfigurationExtensions.cs b/src/Stove.NHibernate/NHibernate/Configuration/StoveNHibernateConfigurationExtensions.cs similarity index 80% rename from src/Stove.NHibernate/Configuration/StoveNHibernateConfigurationExtensions.cs rename to src/Stove.NHibernate/NHibernate/Configuration/StoveNHibernateConfigurationExtensions.cs index 2a4f3b3..ccf72d3 100644 --- a/src/Stove.NHibernate/Configuration/StoveNHibernateConfigurationExtensions.cs +++ b/src/Stove.NHibernate/NHibernate/Configuration/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 b/src/Stove.NHibernate/NHibernate/ISessionProvider.cs similarity index 90% rename from src/Stove.NHibernate/ISessionProvider.cs rename to src/Stove.NHibernate/NHibernate/ISessionProvider.cs index 9c2c830..0e5e2ab 100644 --- a/src/Stove.NHibernate/ISessionProvider.cs +++ b/src/Stove.NHibernate/NHibernate/ISessionProvider.cs @@ -1,6 +1,6 @@ using NHibernate; -namespace Stove +namespace Stove.NHibernate { public interface ISessionProvider { diff --git a/src/Stove.NHibernate/StoveNHibernateBootstrapper.cs b/src/Stove.NHibernate/NHibernate/StoveNHibernateBootstrapper.cs similarity index 70% rename from src/Stove.NHibernate/StoveNHibernateBootstrapper.cs rename to src/Stove.NHibernate/NHibernate/StoveNHibernateBootstrapper.cs index 3e51ab2..4f5eda7 100644 --- a/src/Stove.NHibernate/StoveNHibernateBootstrapper.cs +++ b/src/Stove.NHibernate/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/src/Stove.NHibernate/StoveNHibernateRegistrationExtensions.cs b/src/Stove.NHibernate/NHibernate/StoveNHibernateRegistrationExtensions.cs similarity index 96% rename from src/Stove.NHibernate/StoveNHibernateRegistrationExtensions.cs rename to src/Stove.NHibernate/NHibernate/StoveNHibernateRegistrationExtensions.cs index ba1b484..53527a0 100644 --- a/src/Stove.NHibernate/StoveNHibernateRegistrationExtensions.cs +++ b/src/Stove.NHibernate/NHibernate/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 index 4f09281..5cdeb7f 100644 --- a/src/Stove.NHibernate/Stove.NHibernate.csproj +++ b/src/Stove.NHibernate/Stove.NHibernate.csproj @@ -14,7 +14,6 @@ bin\Release\net461\Stove.NHibernate.xml - bin\Release\netstandard2.0\Stove.NHibernate.xml diff --git a/src/Stove.NLog/NLogRegistrarModule.cs b/src/Stove.NLog/NLog/NLogRegistrarModule.cs similarity index 98% rename from src/Stove.NLog/NLogRegistrarModule.cs rename to src/Stove.NLog/NLog/NLogRegistrarModule.cs index aeb4332..aaf6fde 100644 --- a/src/Stove.NLog/NLogRegistrarModule.cs +++ b/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 b/src/Stove.NLog/NLog/StoveNLogBootstrapper.cs similarity index 88% rename from src/Stove.NLog/StoveNLogBootstrapper.cs rename to src/Stove.NLog/NLog/StoveNLogBootstrapper.cs index f85a462..b9fc313 100644 --- a/src/Stove.NLog/StoveNLogBootstrapper.cs +++ b/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 b/src/Stove.NLog/NLog/StoveNLogLogger.cs similarity index 99% rename from src/Stove.NLog/StoveNLogLogger.cs rename to src/Stove.NLog/NLog/StoveNLogLogger.cs index aef700f..38457da 100644 --- a/src/Stove.NLog/StoveNLogLogger.cs +++ b/src/Stove.NLog/NLog/StoveNLogLogger.cs @@ -4,7 +4,7 @@ using ILogger = Stove.Log.ILogger; -namespace Stove +namespace Stove.NLog { /// /// Implementation of ILogger, deriving from NLog.Logger diff --git a/src/Stove.NLog/StoveNLogRegistrationExtensions.cs b/src/Stove.NLog/NLog/StoveNLogRegistrationExtensions.cs similarity index 97% rename from src/Stove.NLog/StoveNLogRegistrationExtensions.cs rename to src/Stove.NLog/NLog/StoveNLogRegistrationExtensions.cs index 49f8b2f..f0f82d3 100644 --- a/src/Stove.NLog/StoveNLogRegistrationExtensions.cs +++ b/src/Stove.NLog/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.RabbitMQ/StoveRabbitMQBootstrapper.cs b/src/Stove.RabbitMQ/RabbitMQ/StoveRabbitMQBootstrapper.cs similarity index 95% rename from src/Stove.RabbitMQ/StoveRabbitMQBootstrapper.cs rename to src/Stove.RabbitMQ/RabbitMQ/StoveRabbitMQBootstrapper.cs index 408f21d..8a841fa 100644 --- a/src/Stove.RabbitMQ/StoveRabbitMQBootstrapper.cs +++ b/src/Stove.RabbitMQ/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/src/Stove.RabbitMQ/StoveRabbitMQRegistrationExtensions.cs b/src/Stove.RabbitMQ/RabbitMQ/StoveRabbitMQRegistrationExtensions.cs similarity index 97% rename from src/Stove.RabbitMQ/StoveRabbitMQRegistrationExtensions.cs rename to src/Stove.RabbitMQ/RabbitMQ/StoveRabbitMQRegistrationExtensions.cs index 013d78c..cd3d567 100644 --- a/src/Stove.RabbitMQ/StoveRabbitMQRegistrationExtensions.cs +++ b/src/Stove.RabbitMQ/RabbitMQ/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 index 7666a59..4d7631d 100644 --- a/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj +++ b/src/Stove.RabbitMQ/Stove.RabbitMQ.csproj @@ -27,9 +27,9 @@ - - - + + + diff --git a/src/Stove.RavenDB/ISessionProvider.cs b/src/Stove.RavenDB/RavenDB/ISessionProvider.cs similarity index 55% rename from src/Stove.RavenDB/ISessionProvider.cs rename to src/Stove.RavenDB/RavenDB/ISessionProvider.cs index f2126b6..ef17e44 100644 --- a/src/Stove.RavenDB/ISessionProvider.cs +++ b/src/Stove.RavenDB/RavenDB/ISessionProvider.cs @@ -1,7 +1,6 @@ -using Raven.Client; -using Raven.Client.Documents.Session; +using Raven.Client.Documents.Session; -namespace Stove +namespace Stove.RavenDB { public interface ISessionProvider { diff --git a/src/Stove.RavenDB/StoveRavenDBBootstrapper.cs b/src/Stove.RavenDB/RavenDB/StoveRavenDBBootstrapper.cs similarity index 90% rename from src/Stove.RavenDB/StoveRavenDBBootstrapper.cs rename to src/Stove.RavenDB/RavenDB/StoveRavenDBBootstrapper.cs index 6f1692e..890bb61 100644 --- a/src/Stove.RavenDB/StoveRavenDBBootstrapper.cs +++ b/src/Stove.RavenDB/RavenDB/StoveRavenDBBootstrapper.cs @@ -1,10 +1,9 @@ -using Raven.Client; -using Raven.Client.Documents; +using Raven.Client.Documents; using Stove.Bootstrapping; using Stove.RavenDB.Configuration; -namespace Stove +namespace Stove.RavenDB { [DependsOn( typeof(StoveKernelBootstrapper) diff --git a/src/Stove.RavenDB/StoveRavenDBRegistrationExtensions.cs b/src/Stove.RavenDB/RavenDB/StoveRavenDBRegistrationExtensions.cs similarity index 96% rename from src/Stove.RavenDB/StoveRavenDBRegistrationExtensions.cs rename to src/Stove.RavenDB/RavenDB/StoveRavenDBRegistrationExtensions.cs index 8b8478d..96bc47f 100644 --- a/src/Stove.RavenDB/StoveRavenDBRegistrationExtensions.cs +++ b/src/Stove.RavenDB/RavenDB/StoveRavenDBRegistrationExtensions.cs @@ -1,4 +1,4 @@ -using System; +using System; using Autofac; using Autofac.Extras.IocManager; @@ -10,7 +10,7 @@ using Stove.RavenDB.Repositories; using Stove.Reflection.Extensions; -namespace Stove +namespace Stove.RavenDB { public static class StoveRavenDBRegistrationExtensions { diff --git a/src/Stove.Redis/StoveRedisBootstrapper.cs b/src/Stove.Redis/Redis/StoveRedisBootstrapper.cs similarity index 95% rename from src/Stove.Redis/StoveRedisBootstrapper.cs rename to src/Stove.Redis/Redis/StoveRedisBootstrapper.cs index 33bf524..4aae1aa 100644 --- a/src/Stove.Redis/StoveRedisBootstrapper.cs +++ b/src/Stove.Redis/Redis/StoveRedisBootstrapper.cs @@ -1,7 +1,7 @@ using Stove.Bootstrapping; using Stove.Redis.Configurations; -namespace Stove +namespace Stove.Redis { [DependsOn( typeof(StoveKernelBootstrapper) diff --git a/src/Stove.Redis/StoveRedisRegistrationExtensions.cs b/src/Stove.Redis/Redis/StoveRedisRegistrationExtensions.cs similarity index 96% rename from src/Stove.Redis/StoveRedisRegistrationExtensions.cs rename to src/Stove.Redis/Redis/StoveRedisRegistrationExtensions.cs index dae8ae9..797b13c 100644 --- a/src/Stove.Redis/StoveRedisRegistrationExtensions.cs +++ b/src/Stove.Redis/Redis/StoveRedisRegistrationExtensions.cs @@ -1,15 +1,14 @@ -using System; +using System; using Autofac.Extras.IocManager; using JetBrains.Annotations; -using Stove.Redis; using Stove.Redis.Configurations; using Stove.Reflection.Extensions; using Stove.Runtime.Caching; -namespace Stove +namespace Stove.Redis { public static class StoveRedisRegistrationExtensions { diff --git a/src/Stove.Serilog/Serilog/SerilogRegistrarModule.cs b/src/Stove.Serilog/Serilog/SerilogRegistrarModule.cs index d2e1d64..6ce82f8 100644 --- a/src/Stove.Serilog/Serilog/SerilogRegistrarModule.cs +++ b/src/Stove.Serilog/Serilog/SerilogRegistrarModule.cs @@ -7,11 +7,10 @@ using Autofac.Core; using Stove.Log; -using Stove.Serilog; using Module = Autofac.Module; -namespace Stove +namespace Stove.Serilog { public class SerilogRegistrarModule : Module { diff --git a/src/Stove.Serilog/StoveSerilogBootstrapper.cs b/src/Stove.Serilog/Serilog/StoveSerilogBootstrapper.cs similarity index 86% rename from src/Stove.Serilog/StoveSerilogBootstrapper.cs rename to src/Stove.Serilog/Serilog/StoveSerilogBootstrapper.cs index e4d2b0d..a8fee41 100644 --- a/src/Stove.Serilog/StoveSerilogBootstrapper.cs +++ b/src/Stove.Serilog/Serilog/StoveSerilogBootstrapper.cs @@ -1,6 +1,6 @@ using Stove.Bootstrapping; -namespace Stove +namespace Stove.Serilog { [DependsOn( typeof(StoveKernelBootstrapper) diff --git a/src/Stove.Serilog/StoveSerilogRegistrationExtensions.cs b/src/Stove.Serilog/Serilog/StoveSerilogRegistrationExtensions.cs similarity index 95% rename from src/Stove.Serilog/StoveSerilogRegistrationExtensions.cs rename to src/Stove.Serilog/Serilog/StoveSerilogRegistrationExtensions.cs index 72e8f95..423b76c 100644 --- a/src/Stove.Serilog/StoveSerilogRegistrationExtensions.cs +++ b/src/Stove.Serilog/Serilog/StoveSerilogRegistrationExtensions.cs @@ -6,9 +6,8 @@ using Serilog; using Stove.Reflection.Extensions; -using Stove.Serilog; -namespace Stove +namespace Stove.Serilog { public static class StoveSerilogRegistrationExtensions { diff --git a/test/Stove.Dapper.Tests/StoveDapperTestBootstrapper.cs b/test/Stove.Dapper.Tests/StoveDapperTestBootstrapper.cs index f55e900..82b7de1 100644 --- a/test/Stove.Dapper.Tests/StoveDapperTestBootstrapper.cs +++ b/test/Stove.Dapper.Tests/StoveDapperTestBootstrapper.cs @@ -6,6 +6,7 @@ using Stove.Bootstrapping; using Stove.Dapper.Tests.DbContexes; +using Stove.EntityFramework; namespace Stove.Dapper.Tests { diff --git a/test/Stove.Demo.ConsoleApp.Nh/Program.cs b/test/Stove.Demo.ConsoleApp.Nh/Program.cs index 6608a3e..666e30e 100644 --- a/test/Stove.Demo.ConsoleApp.Nh/Program.cs +++ b/test/Stove.Demo.ConsoleApp.Nh/Program.cs @@ -7,6 +7,9 @@ using HibernatingRhinos.Profiler.Appender.NHibernate; +using Stove.Dapper; +using Stove.NHibernate; + namespace Stove.Demo.ConsoleApp.Nh { public class Program diff --git a/test/Stove.Demo.ConsoleApp.Nh/StoveDemoBootstrapper.cs b/test/Stove.Demo.ConsoleApp.Nh/StoveDemoBootstrapper.cs index 3c17248..0e9132b 100644 --- a/test/Stove.Demo.ConsoleApp.Nh/StoveDemoBootstrapper.cs +++ b/test/Stove.Demo.ConsoleApp.Nh/StoveDemoBootstrapper.cs @@ -1,6 +1,8 @@ using System.Configuration; using Stove.Bootstrapping; +using Stove.Dapper; +using Stove.NHibernate; namespace Stove.Demo.ConsoleApp.Nh { diff --git a/test/Stove.Demo.ConsoleApp.RavenDB/Program.cs b/test/Stove.Demo.ConsoleApp.RavenDB/Program.cs index e50adf3..d5108da 100644 --- a/test/Stove.Demo.ConsoleApp.RavenDB/Program.cs +++ b/test/Stove.Demo.ConsoleApp.RavenDB/Program.cs @@ -2,6 +2,8 @@ using Autofac.Extras.IocManager; +using Stove.RavenDB; + namespace Stove.Demo.ConsoleApp.RavenDB { public class Program diff --git a/test/Stove.Demo.ConsoleApp.RavenDB/StoveRavenDBDemoBootstrapper.cs b/test/Stove.Demo.ConsoleApp.RavenDB/StoveRavenDBDemoBootstrapper.cs index a44eef8..b18e3d1 100644 --- a/test/Stove.Demo.ConsoleApp.RavenDB/StoveRavenDBDemoBootstrapper.cs +++ b/test/Stove.Demo.ConsoleApp.RavenDB/StoveRavenDBDemoBootstrapper.cs @@ -1,4 +1,5 @@ using Stove.Bootstrapping; +using Stove.RavenDB; namespace Stove.Demo.ConsoleApp.RavenDB { diff --git a/test/Stove.Demo.ConsoleApp/Program.cs b/test/Stove.Demo.ConsoleApp/Program.cs index bf60579..56e1c3b 100644 --- a/test/Stove.Demo.ConsoleApp/Program.cs +++ b/test/Stove.Demo.ConsoleApp/Program.cs @@ -10,8 +10,14 @@ using MassTransit; +using Stove.Dapper; using Stove.Demo.ConsoleApp.DbContexes; using Stove.EntityFramework; +using Stove.Hangfire; +using Stove.Mapster; +using Stove.NLog; +using Stove.RabbitMQ; +using Stove.Redis; using Stove.Redis.Configurations; namespace Stove.Demo.ConsoleApp diff --git a/test/Stove.Demo.ConsoleApp/StoveDemoBootstrapper.cs b/test/Stove.Demo.ConsoleApp/StoveDemoBootstrapper.cs index 5167757..6f68343 100644 --- a/test/Stove.Demo.ConsoleApp/StoveDemoBootstrapper.cs +++ b/test/Stove.Demo.ConsoleApp/StoveDemoBootstrapper.cs @@ -8,8 +8,14 @@ using Dapper; using Stove.Bootstrapping; +using Stove.Dapper; using Stove.Demo.ConsoleApp.DbContexes; +using Stove.EntityFramework; using Stove.EntityFramework.Interceptors; +using Stove.Hangfire; +using Stove.Mapster; +using Stove.RabbitMQ; +using Stove.Redis; namespace Stove.Demo.ConsoleApp { diff --git a/test/Stove.Demo.WebApi.Core/Startup.cs b/test/Stove.Demo.WebApi.Core/Startup.cs index 65952c7..d911a5f 100644 --- a/test/Stove.Demo.WebApi.Core/Startup.cs +++ b/test/Stove.Demo.WebApi.Core/Startup.cs @@ -17,8 +17,15 @@ using NLog.Extensions.Logging; using NLog.Web; +using Stove.Dapper; using Stove.Demo.WebApi.Core.Domain.DbContexts; using Stove.EntityFramework; +using Stove.EntityFrameworkCore; +using Stove.Hangfire; +using Stove.Mapster; +using Stove.NLog; +using Stove.RabbitMQ; +using Stove.Redis; using Stove.Redis.Configurations; using Stove.Reflection.Extensions; diff --git a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj index 0cbb429..43e114b 100644 --- a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj +++ b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj @@ -12,7 +12,7 @@ - + diff --git a/test/Stove.Demo.WebApi.Core/StoveWebApiCoreBootstrapper.cs b/test/Stove.Demo.WebApi.Core/StoveWebApiCoreBootstrapper.cs index 165c5fb..5679cf5 100644 --- a/test/Stove.Demo.WebApi.Core/StoveWebApiCoreBootstrapper.cs +++ b/test/Stove.Demo.WebApi.Core/StoveWebApiCoreBootstrapper.cs @@ -1,5 +1,11 @@ using Stove.Bootstrapping; +using Stove.Dapper; using Stove.Demo.WebApi.Core.Domain.DbContexts; +using Stove.EntityFrameworkCore; +using Stove.Hangfire; +using Stove.Mapster; +using Stove.RabbitMQ; +using Stove.Redis; namespace Stove.Demo.WebApi.Core { diff --git a/test/Stove.Demo.WebApi/Startup.cs b/test/Stove.Demo.WebApi/Startup.cs index 8b8f0ec..3ff6ccc 100644 --- a/test/Stove.Demo.WebApi/Startup.cs +++ b/test/Stove.Demo.WebApi/Startup.cs @@ -9,7 +9,10 @@ using Owin; +using Stove.Dapper; using Stove.Demo.WebApi; +using Stove.EntityFramework; +using Stove.NLog; using Swashbuckle.Application; diff --git a/test/Stove.Demo.WebApi/StoveDemoWebApiBootstapper.cs b/test/Stove.Demo.WebApi/StoveDemoWebApiBootstapper.cs index 2a3ca09..744941a 100644 --- a/test/Stove.Demo.WebApi/StoveDemoWebApiBootstapper.cs +++ b/test/Stove.Demo.WebApi/StoveDemoWebApiBootstapper.cs @@ -1,4 +1,6 @@ using Stove.Bootstrapping; +using Stove.Dapper; +using Stove.EntityFramework; namespace Stove.Demo.WebApi { diff --git a/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestApplicationBase.cs b/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestApplicationBase.cs index e765b8a..119113a 100644 --- a/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestApplicationBase.cs +++ b/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestApplicationBase.cs @@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata.Internal; +using Stove.Dapper; using Stove.Domain.Repositories; using Stove.EntityFrameworkCore.Dapper.Tests.Domain; using Stove.EntityFrameworkCore.Dapper.Tests.Ef; diff --git a/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestBootstrapper.cs b/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestBootstrapper.cs index b8d6c23..1bc5e72 100644 --- a/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestBootstrapper.cs +++ b/test/Stove.EntityFrameworkCore.Dapper.Tests/StoveEfCoreDapperTestBootstrapper.cs @@ -5,6 +5,7 @@ using DapperExtensions.Sql; using Stove.Bootstrapping; +using Stove.Dapper; using Stove.Reflection.Extensions; namespace Stove.EntityFrameworkCore.Dapper.Tests diff --git a/test/Stove.NHibernate.Tests/General_Repository_With_Dapper_Tests.cs b/test/Stove.NHibernate.Tests/General_Repository_With_Dapper_Tests.cs index f1477ce..e3e7f29 100644 --- a/test/Stove.NHibernate.Tests/General_Repository_With_Dapper_Tests.cs +++ b/test/Stove.NHibernate.Tests/General_Repository_With_Dapper_Tests.cs @@ -3,6 +3,7 @@ using Shouldly; +using Stove.Dapper; using Stove.Dapper.Repositories; using Stove.Domain.Repositories; using Stove.Domain.Uow; diff --git a/test/Stove.Tests.SampleApplication/SampleApplicationBootstrapper.cs b/test/Stove.Tests.SampleApplication/SampleApplicationBootstrapper.cs index f169b0e..7dec5a3 100644 --- a/test/Stove.Tests.SampleApplication/SampleApplicationBootstrapper.cs +++ b/test/Stove.Tests.SampleApplication/SampleApplicationBootstrapper.cs @@ -1,4 +1,5 @@ using Stove.Bootstrapping; +using Stove.EntityFramework; using Stove.Mapster; namespace Stove.Tests.SampleApplication diff --git a/test/Stove.Tests.SampleApplication/SampleApplicationTestBase.cs b/test/Stove.Tests.SampleApplication/SampleApplicationTestBase.cs index e2f838b..326be80 100644 --- a/test/Stove.Tests.SampleApplication/SampleApplicationTestBase.cs +++ b/test/Stove.Tests.SampleApplication/SampleApplicationTestBase.cs @@ -8,6 +8,8 @@ using EntityFramework.DynamicFilters; +using Stove.EntityFramework; +using Stove.Mapster; using Stove.Runtime.Session; using Stove.TestBase; using Stove.Tests.SampleApplication.Domain; From 688eca501f695f9bc48ac60e0d614c3b8e3f7858 Mon Sep 17 00:00:00 2001 From: osoykan Date: Sun, 1 Oct 2017 16:41:24 +0300 Subject: [PATCH 6/6] version incremented to 2.0.1 --- common.props | 2 +- src/Stove/Stove.csproj | 4 ++-- .../Stove.Demo.WebApi.Core.csproj | 2 +- test/Stove.TestBase/Stove.TestBase.csproj | 15 +-------------- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/common.props b/common.props index 0561478..bb7f4f5 100644 --- a/common.props +++ b/common.props @@ -1,6 +1,6 @@ - 2.0.0 + 2.0.1 $(NoWarn);CS1591 https://raw.githubusercontent.com/osoykan/Stove/master/stove.png https://github.com/osoykan/Stove diff --git a/src/Stove/Stove.csproj b/src/Stove/Stove.csproj index 1f9ebdf..9f1067f 100644 --- a/src/Stove/Stove.csproj +++ b/src/Stove/Stove.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj index 43e114b..16fc6fc 100644 --- a/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj +++ b/test/Stove.Demo.WebApi.Core/Stove.Demo.WebApi.Core.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/Stove.TestBase/Stove.TestBase.csproj b/test/Stove.TestBase/Stove.TestBase.csproj index e886371..0faf5d1 100644 --- a/test/Stove.TestBase/Stove.TestBase.csproj +++ b/test/Stove.TestBase/Stove.TestBase.csproj @@ -16,10 +16,6 @@ - - lib/net461/ - true - lib/netstandard2.0/ true @@ -29,14 +25,5 @@ - - - - - - - - - - +