From a9cfc41a22c65697e245bafb7df712d5a5fd3929 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 13 Apr 2023 10:07:32 +0800 Subject: [PATCH 1/2] Update ChangeThemeStep.cs Resolve #16195 --- .../Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index 625cb3d500e..69cf456993c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -844,6 +844,13 @@ private void ChangeThemeToBasicForBlazorProjects(ProjectBuildContext context, st $"Blazor{defaultThemeName}ThemeBundles.Scripts.Global", "BlazorBasicThemeBundles.Scripts.Global" ); + + ChangeNamespace( + context, + $"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", + $"Volo.Abp.AspNetCore.Components.Web.{defaultThemeName}Theme.Themes.{defaultThemeName}", + "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic" + ); } } From 0538422f7739c5135fcf3abfde9120927dd6e0d6 Mon Sep 17 00:00:00 2001 From: maliming Date: Mon, 24 Apr 2023 10:49:34 +0800 Subject: [PATCH 2/2] Add models of openiddict to ` ModuleExtensionConfiguration`. --- .../OpenIddict/AbpOpenIddictDomainModule.cs | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs index c9ec33780ec..1312ad5d8c6 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs @@ -93,23 +93,47 @@ public override void PostConfigureServices(ServiceConfigurationContext context) typeof(OpenIddictApplication) ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( + OpenIddictModuleExtensionConsts.ModuleName, + OpenIddictModuleExtensionConsts.EntityNames.Application, + typeof(OpenIddictApplicationModel) + ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( OpenIddictModuleExtensionConsts.ModuleName, OpenIddictModuleExtensionConsts.EntityNames.Authorization, typeof(OpenIddictAuthorization) ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( + OpenIddictModuleExtensionConsts.ModuleName, + OpenIddictModuleExtensionConsts.EntityNames.Authorization, + typeof(OpenIddictAuthorizationModel) + ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( OpenIddictModuleExtensionConsts.ModuleName, OpenIddictModuleExtensionConsts.EntityNames.Scope, typeof(OpenIddictScope) ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( + OpenIddictModuleExtensionConsts.ModuleName, + OpenIddictModuleExtensionConsts.EntityNames.Scope, + typeof(OpenIddictScopeModel) + ); + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( OpenIddictModuleExtensionConsts.ModuleName, OpenIddictModuleExtensionConsts.EntityNames.Token, typeof(OpenIddictToken) ); + + ModuleExtensionConfigurationHelper.ApplyEntityConfigurationToEntity( + OpenIddictModuleExtensionConsts.ModuleName, + OpenIddictModuleExtensionConsts.EntityNames.Token, + typeof(OpenIddictTokenModel) + ); }); } }