From 0bba783e9bc109d13b14f74614425a0ce1126ee5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 6 Jul 2018 17:13:30 +0300 Subject: [PATCH] acme.bookstrore sample upgraded to abp 0.3.7 --- .../Acme.BookStore.Application.csproj | 2 +- .../BookStoreApplicationModule.cs | 8 ++--- .../Acme.BookStore.Domain.csproj | 2 +- .../BookStoreDomainModule.cs | 10 +++---- .../Acme.BookStore.EntityFrameworkCore.csproj | 8 ++--- .../BookStoreEntityFrameworkCoreModule.cs | 6 ++-- .../Acme.BookStore.Web.csproj | 8 ++--- .../Acme.BookStore.Web/BookStoreWebModule.cs | 30 +++++++++---------- .../Acme.BookStore.Application.Tests.csproj | 4 +-- .../BookStoreApplicationTestModule.cs | 8 ++--- .../Acme.BookStore.Web.Tests.csproj | 2 +- .../BookStoreWebTestModule.cs | 12 ++++---- 12 files changed, 50 insertions(+), 50 deletions(-) diff --git a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj index 313a6dc191..c17ec0c423 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj +++ b/samples/BookStore/src/Acme.BookStore.Application/Acme.BookStore.Application.csproj @@ -7,7 +7,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs b/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs index fb7bc32d37..01607ebdc5 100644 --- a/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Application/BookStoreApplicationModule.cs @@ -12,19 +12,19 @@ namespace Acme.BookStore typeof(AbpIdentityApplicationModule))] public class BookStoreApplicationModule : AbpModule { - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - services.Configure(options => + context.Services.Configure(options => { options.DefinitionProviders.Add(); }); - services.Configure(options => + context.Services.Configure(options => { options.AddProfile(); }); - services.AddAssemblyOf(); + context.Services.AddAssemblyOf(); } } } diff --git a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj index 25cb88eb69..ef7e99ad5f 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj +++ b/samples/BookStore/src/Acme.BookStore.Domain/Acme.BookStore.Domain.csproj @@ -6,7 +6,7 @@ - + diff --git a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 90290731a5..b31e3b8bb1 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -13,14 +13,14 @@ namespace Acme.BookStore [DependsOn(typeof(AbpIdentityDomainModule))] public class BookStoreDomainModule : AbpModule { - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - services.Configure(options => + context.Services.Configure(options => { options.FileSets.AddEmbedded(); }); - services.Configure(options => + context.Services.Configure(options => { options.Resources .Add("en") @@ -28,12 +28,12 @@ namespace Acme.BookStore .AddVirtualJson("/Localization/BookStore"); }); - services.Configure(options => + context.Services.Configure(options => { options.DefinitionProviders.Add(); }); - services.AddAssemblyOf(); + context.Services.AddAssemblyOf(); } } } diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj index 93d069283a..0ffbf27b57 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/Acme.BookStore.EntityFrameworkCore.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs index 6bf19b5a82..0a6c2aada3 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs @@ -15,14 +15,14 @@ namespace Acme.BookStore.EntityFrameworkCore typeof(AbpEntityFrameworkCoreSqlServerModule))] public class BookStoreEntityFrameworkCoreModule : AbpModule { - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - services.AddAbpDbContext(options => + context.Services.AddAbpDbContext(options => { options.AddDefaultRepositories(); }); - services.AddAssemblyOf(); + context.Services.AddAssemblyOf(); } } } diff --git a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj index 2fd7df9f78..94f8d21e25 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj +++ b/samples/BookStore/src/Acme.BookStore.Web/Acme.BookStore.Web.csproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index c40f73d925..c00a49ee43 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -48,9 +48,9 @@ namespace Acme.BookStore )] public class BookStoreWebModule : AbpModule { - public override void PreConfigureServices(IServiceCollection services) + public override void PreConfigureServices(ServiceConfigurationContext context) { - services.PreConfigure(options => + context.Services.PreConfigure(options => { options.AddAssemblyResource( typeof(BookStoreResource), @@ -61,20 +61,20 @@ namespace Acme.BookStore }); } - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - var hostingEnvironment = services.GetHostingEnvironment(); - var configuration = services.BuildConfiguration(); - - ConfigureDatabaseServices(services, configuration); - ConfigureAutoMapper(services); - ConfigureVirtualFileSystem(services, hostingEnvironment); - ConfigureLocalizationServices(services); - ConfigureNavigationServices(services); - ConfigureAutoApiControllers(services); - ConfigureSwaggerServices(services); - - services.AddAssemblyOf(); + var hostingEnvironment = context.Services.GetHostingEnvironment(); + var configuration = context.Services.BuildConfiguration(); + + ConfigureDatabaseServices(context.Services, configuration); + ConfigureAutoMapper(context.Services); + ConfigureVirtualFileSystem(context.Services, hostingEnvironment); + ConfigureLocalizationServices(context.Services); + ConfigureNavigationServices(context.Services); + ConfigureAutoApiControllers(context.Services); + ConfigureSwaggerServices(context.Services); + + context.Services.AddAssemblyOf(); } private static void ConfigureDatabaseServices(IServiceCollection services, IConfigurationRoot configuration) diff --git a/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj b/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj index 4bfc987755..2ab3ae3592 100644 --- a/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj +++ b/samples/BookStore/test/Acme.BookStore.Application.Tests/Acme.BookStore.Application.Tests.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreApplicationTestModule.cs b/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreApplicationTestModule.cs index 2ce74f6cff..9c886d9329 100644 --- a/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreApplicationTestModule.cs +++ b/samples/BookStore/test/Acme.BookStore.Application.Tests/BookStoreApplicationTestModule.cs @@ -21,13 +21,13 @@ namespace Acme.BookStore { private SqliteConnection _sqliteConnection; - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - services.AddAlwaysAllowAuthorization(); + context.Services.AddAlwaysAllowAuthorization(); - ConfigureInMemorySqlite(services); + ConfigureInMemorySqlite(context.Services); - services.AddAssemblyOf(); + context.Services.AddAssemblyOf(); } private void ConfigureInMemorySqlite(IServiceCollection services) diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj index 97fe750bcb..62677cbf3f 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/Acme.BookStore.Web.Tests.csproj @@ -15,7 +15,7 @@ - + diff --git a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs index 0e5db6749f..669c3dfe7b 100644 --- a/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs +++ b/samples/BookStore/test/Acme.BookStore.Web.Tests/BookStoreWebTestModule.cs @@ -32,20 +32,20 @@ namespace Acme.BookStore )] public class BookStoreWebTestModule : AbpModule { - public override void PreConfigureServices(IServiceCollection services) + public override void PreConfigureServices(ServiceConfigurationContext context) { - services.PreConfigure(builder => + context.Services.PreConfigure(builder => { builder.PartManager.ApplicationParts.Add(new AssemblyPart(typeof(BookStoreWebModule).Assembly)); }); } - public override void ConfigureServices(IServiceCollection services) + public override void ConfigureServices(ServiceConfigurationContext context) { - ConfigureLocalizationServices(services); - ConfigureNavigationServices(services); + ConfigureLocalizationServices(context.Services); + ConfigureNavigationServices(context.Services); - services.AddAssemblyOf(); + context.Services.AddAssemblyOf(); } private static void ConfigureLocalizationServices(IServiceCollection services)