From 07537481bf74d633bf7f907c89f1a02ff88fb93f Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 25 Oct 2019 13:49:47 +0800 Subject: [PATCH 1/7] Update the Sample project. Resolve #2012 --- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../BookStoreHttpApiHostModule.cs | 6 +++--- .../MongoDb/BookStoreMongoDbModule.cs | 2 +- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../BookStoreMigrationsDbContextFactory.cs | 2 +- .../BookStoreEntityFrameworkCoreModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 4 ++-- .../BookManagementHttpApiHostModule.cs | 2 +- .../MyProjectHttpApiHostMigrationsDbContextFactory.cs | 2 +- .../BookManagementIdentityServerModule.cs | 2 +- .../IdentityServerHostMigrationsDbContextFactory.cs | 2 +- .../BookManagementWebHostModule.cs | 10 +++++----- .../EntityFrameworkCore/UnifiedDbContextFactory.cs | 2 +- .../BookStoreDomainSharedModule.cs | 2 +- .../src/Acme.BookStore.Domain/BookStoreDomainModule.cs | 2 +- .../BookStoreEntityFrameworkCoreModule.cs | 2 +- .../src/Acme.BookStore.Web/BookStoreWebModule.cs | 4 ++-- .../DashboardDemoDomainSharedModule.cs | 2 +- .../DashboardDemo.Domain/DashboardDemoDomainModule.cs | 2 +- .../DashboardDemoMigrationsDbContextFactory.cs | 2 +- .../DashboardDemoEntityFrameworkCoreModule.cs | 2 +- .../src/DashboardDemo.Web/DashboardDemoWebModule.cs | 4 ++-- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index e7f8fc146a..95241feeb8 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -16,7 +16,7 @@ namespace Acme.BookStore { [DependsOn( typeof(AbpAuditLoggingDomainSharedModule), - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), typeof(AbpIdentityServerDomainSharedModule), diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 91cae5f506..2f3f2610a9 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -16,7 +16,7 @@ namespace Acme.BookStore [DependsOn( typeof(BookStoreDomainSharedModule), typeof(AbpAuditLoggingDomainModule), - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs index 32163e5cda..d7ccc537e0 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.HttpApi.Host/BookStoreHttpApiHostModule.cs @@ -54,7 +54,7 @@ namespace Acme.BookStore ConfigureSwaggerServices(context); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -86,7 +86,7 @@ namespace Acme.BookStore }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => @@ -123,7 +123,7 @@ namespace Acme.BookStore }); } - private void ConfigureCors(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureCors(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddCors(options => { diff --git a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.MongoDB/MongoDb/BookStoreMongoDbModule.cs b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.MongoDB/MongoDb/BookStoreMongoDbModule.cs index cd0696569f..356ff38ef5 100644 --- a/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.MongoDB/MongoDb/BookStoreMongoDbModule.cs +++ b/samples/BookStore-Angular-MongoDb/aspnet-core/src/Acme.BookStore.MongoDB/MongoDb/BookStoreMongoDbModule.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore.MongoDB typeof(AbpSettingManagementMongoDbModule), typeof(AbpIdentityMongoDbModule), typeof(AbpIdentityServerMongoDbModule), - typeof(BackgroundJobsMongoDbModule), + typeof(AbpBackgroundJobsMongoDbModule), typeof(AbpAuditLoggingMongoDbModule), typeof(AbpTenantManagementMongoDbModule), typeof(AbpFeatureManagementMongoDbModule) diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index fe94f9d80d..8d6172ee28 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore { [DependsOn( typeof(AbpAuditLoggingDomainSharedModule), - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), typeof(AbpIdentityServerDomainSharedModule), diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 3c5fabb562..fdd0445913 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore [DependsOn( typeof(BookStoreDomainSharedModule), typeof(AbpAuditLoggingDomainModule), - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs index da72e6fb21..7212eb7340 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/BookStoreMigrationsDbContextFactory.cs @@ -19,7 +19,7 @@ namespace Acme.BookStore.EntityFrameworkCore return new BookStoreMigrationsDbContext(builder.Options); } - private static IConfigurationRoot BuildConfiguration() + private static IConfiguration BuildConfiguration() { var builder = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs index 08c438f03a..5cb2a6dc7e 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs @@ -21,7 +21,7 @@ namespace Acme.BookStore.EntityFrameworkCore typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule), diff --git a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs index e13fcdca40..f8a38f66b4 100644 --- a/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore-Modular/application/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -82,7 +82,7 @@ namespace Acme.BookStore.Web ConfigureSwaggerServices(context.Services); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -90,7 +90,7 @@ namespace Acme.BookStore.Web }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs index 431d3f467a..1e9a170c47 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/BookManagementHttpApiHostModule.cs @@ -89,7 +89,7 @@ namespace Acme.BookStore.BookManagement options.ApiName = "BookManagement"; }); - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/EntityFrameworkCore/MyProjectHttpApiHostMigrationsDbContextFactory.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/EntityFrameworkCore/MyProjectHttpApiHostMigrationsDbContextFactory.cs index 90798873d4..8def84ba37 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/EntityFrameworkCore/MyProjectHttpApiHostMigrationsDbContextFactory.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.HttpApi.Host/EntityFrameworkCore/MyProjectHttpApiHostMigrationsDbContextFactory.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore return new MyProjectHttpApiHostMigrationsDbContext(builder.Options); } - private static IConfigurationRoot BuildConfiguration() + private static IConfiguration BuildConfiguration() { var builder = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs index 2133245501..9c75a1b167 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/BookManagementIdentityServerModule.cs @@ -108,7 +108,7 @@ namespace Acme.BookStore.BookManagement options.ApiName = configuration["AuthServer:ApiName"]; }); - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/EntityFrameworkCore/IdentityServerHostMigrationsDbContextFactory.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/EntityFrameworkCore/IdentityServerHostMigrationsDbContextFactory.cs index d099542fa1..03824a1c70 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/EntityFrameworkCore/IdentityServerHostMigrationsDbContextFactory.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.IdentityServer/EntityFrameworkCore/IdentityServerHostMigrationsDbContextFactory.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore return new IdentityServerHostMigrationsDbContext(builder.Options); } - private static IConfigurationRoot BuildConfiguration() + private static IConfiguration BuildConfiguration() { var builder = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs index abe360ec94..da1a8dc2fb 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Host/BookManagementWebHostModule.cs @@ -85,15 +85,15 @@ namespace Acme.BookStore.BookManagement ConfigureRedis(context, configuration, hostingEnvironment); } - private void ConfigureCache(IConfigurationRoot configuration) + private void ConfigureCache(IConfiguration configuration) { - Configure(options => + Configure(options => { options.KeyPrefix = "BookManagement:"; }); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -109,7 +109,7 @@ namespace Acme.BookStore.BookManagement }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication(options => { @@ -177,7 +177,7 @@ namespace Acme.BookStore.BookManagement private void ConfigureRedis( ServiceConfigurationContext context, - IConfigurationRoot configuration, + IConfiguration configuration, IWebHostEnvironment hostingEnvironment) { context.Services.AddStackExchangeRedisCache(options => diff --git a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs index feda4e7912..0becde1b9d 100644 --- a/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs +++ b/samples/BookStore-Modular/modules/book-management/host/Acme.BookStore.BookManagement.Web.Unified/EntityFrameworkCore/UnifiedDbContextFactory.cs @@ -17,7 +17,7 @@ namespace Acme.BookStore.BookManagement.EntityFrameworkCore return new UnifiedDbContext(builder.Options); } - private static IConfigurationRoot BuildConfiguration() + private static IConfiguration BuildConfiguration() { var builder = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) diff --git a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs index e7f8fc146a..95241feeb8 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain.Shared/BookStoreDomainSharedModule.cs @@ -16,7 +16,7 @@ namespace Acme.BookStore { [DependsOn( typeof(AbpAuditLoggingDomainSharedModule), - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), typeof(AbpIdentityServerDomainSharedModule), diff --git a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs index 91cae5f506..2f3f2610a9 100644 --- a/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Domain/BookStoreDomainModule.cs @@ -16,7 +16,7 @@ namespace Acme.BookStore [DependsOn( typeof(BookStoreDomainSharedModule), typeof(AbpAuditLoggingDomainModule), - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), diff --git a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs index efa5642632..156a4207cb 100644 --- a/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs +++ b/samples/BookStore/src/Acme.BookStore.EntityFrameworkCore/EntityFrameworkCore/BookStoreEntityFrameworkCoreModule.cs @@ -20,7 +20,7 @@ namespace Acme.BookStore.EntityFrameworkCore typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule) diff --git a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs index 6b071d8b71..e835890482 100644 --- a/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs +++ b/samples/BookStore/src/Acme.BookStore.Web/BookStoreWebModule.cs @@ -73,7 +73,7 @@ namespace Acme.BookStore.Web ConfigureSwaggerServices(context.Services); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -81,7 +81,7 @@ namespace Acme.BookStore.Web }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs index 4b7195bb94..ad6d56630b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain.Shared/DashboardDemoDomainSharedModule.cs @@ -16,7 +16,7 @@ namespace DashboardDemo { [DependsOn( typeof(AbpAuditLoggingDomainSharedModule), - typeof(BackgroundJobsDomainSharedModule), + typeof(AbpBackgroundJobsDomainSharedModule), typeof(AbpFeatureManagementDomainSharedModule), typeof(AbpIdentityDomainSharedModule), typeof(AbpIdentityServerDomainSharedModule), diff --git a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs index 0b0a2b5d76..5e386f7336 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Domain/DashboardDemoDomainModule.cs @@ -16,7 +16,7 @@ namespace DashboardDemo [DependsOn( typeof(DashboardDemoDomainSharedModule), typeof(AbpAuditLoggingDomainModule), - typeof(BackgroundJobsDomainModule), + typeof(AbpBackgroundJobsDomainModule), typeof(AbpFeatureManagementDomainModule), typeof(AbpIdentityDomainModule), typeof(AbpPermissionManagementDomainIdentityModule), diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs index a2ff117ec4..0773892abc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore.DbMigrations/EntityFrameworkCore/DashboardDemoMigrationsDbContextFactory.cs @@ -19,7 +19,7 @@ namespace DashboardDemo.EntityFrameworkCore return new DashboardDemoMigrationsDbContext(builder.Options); } - private static IConfigurationRoot BuildConfiguration() + private static IConfiguration BuildConfiguration() { var builder = new ConfigurationBuilder() .SetBasePath(Directory.GetCurrentDirectory()) diff --git a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs index 66c26ec224..de03726a20 100644 --- a/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.EntityFrameworkCore/EntityFrameworkCore/DashboardDemoEntityFrameworkCoreModule.cs @@ -20,7 +20,7 @@ namespace DashboardDemo.EntityFrameworkCore typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreSqlServerModule), - typeof(BackgroundJobsEntityFrameworkCoreModule), + typeof(AbpBackgroundJobsEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule) diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index b10bda3080..4b84952eec 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -79,7 +79,7 @@ namespace DashboardDemo.Web ConfigureSwaggerServices(context.Services); } - private void ConfigureUrls(IConfigurationRoot configuration) + private void ConfigureUrls(IConfiguration configuration) { Configure(options => { @@ -87,7 +87,7 @@ namespace DashboardDemo.Web }); } - private void ConfigureAuthentication(ServiceConfigurationContext context, IConfigurationRoot configuration) + private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { context.Services.AddAuthentication() .AddIdentityServerAuthentication(options => From 6c238f4ccaae4e5ff88338cdadde4c153e16a927 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Fri, 25 Oct 2019 09:31:20 +0300 Subject: [PATCH 2/7] fixed https://github.com/abpframework/abp/issues/2004 --- .../Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index c0825352d1..d675251ac4 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -233,6 +233,13 @@ namespace Volo.Docs.Pages.Documents.Project } } } + else + { + LatestVersionInfo = new VersionInfoViewModel( + $"{DocsAppConsts.Latest}", + DocsAppConsts.Latest, + true); + } VersionSelectItems = versions.Select(v => new SelectListItem { From 04bcc4f4a92a213f737e9104b417fd986d803e69 Mon Sep 17 00:00:00 2001 From: thediaval Date: Fri, 25 Oct 2019 15:45:02 +0300 Subject: [PATCH 3/7] feat(settings-management): add requiredPolicy to settings page --- .../src/lib/services/setting-management-config.service.ts | 1 + .../src/lib/setting-management-routing.module.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts b/npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts index 209c6741b1..bc1dc78da3 100644 --- a/npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts +++ b/npm/ng-packs/packages/setting-management-config/src/lib/services/setting-management-config.service.ts @@ -12,6 +12,7 @@ export class SettingManagementConfigService { name: 'AbpSettingManagement::Settings', path: 'setting-management', parentName: 'AbpUiNavigation::Menu:Administration', + requiredPolicy: 'AbpAccount.SettingManagement', layout: eLayoutType.application, order: 6, iconClass: 'fa fa-cog', diff --git a/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts b/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts index d1cb780777..c3eb479d2d 100644 --- a/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts +++ b/npm/ng-packs/packages/setting-management/src/lib/setting-management-routing.module.ts @@ -7,7 +7,9 @@ const routes: Routes = [ { path: '', component: DynamicLayoutComponent, - children: [{ path: '', component: SettingManagementComponent }], + children: [ + { path: '', component: SettingManagementComponent, data: { requiredPolicy: 'AbpAccount.SettingManagement' } }, + ], }, ]; From e0902a1a20227e4e8e695303357b29b42b9fd8c8 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Fri, 25 Oct 2019 16:15:28 +0300 Subject: [PATCH 4/7] feat(theme-shared): add overflow-hidden class --- npm/ng-packs/package.json | 4 ++-- .../application-layout/application-layout.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/npm/ng-packs/package.json b/npm/ng-packs/package.json index 99e8eff80a..1ecfd007f2 100644 --- a/npm/ng-packs/package.json +++ b/npm/ng-packs/package.json @@ -50,12 +50,12 @@ "codelyzer": "^5.1.2", "cz-conventional-changelog": "3.0.2", "font-awesome": "^4.7.0", - "husky": "^3.0.7", + "husky": "^3.0.9", "jest": "^24.9.0", "jest-preset-angular": "^7.1.1", "just-clone": "3.1.0", "just-compare": "^1.3.0", - "lint-staged": "^9.4.0", + "lint-staged": "^9.4.2", "ng-packagr": "^5.5.0", "ngx-perfect-scrollbar": "^8.0.0", "ngxs-reset-plugin": "^1.2.0", diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html index 12b68c98c9..82d561c83a 100644 --- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html +++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html @@ -15,10 +15,10 @@ > -