Merge pull request #16349 from abpframework/auto-merge/rel-7-1/1887

abpframework · Apr 24, 2023 · 27780bf · 27780bf
2 parents 5e6c483 + 8f18e0e
commit 27780bf
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/...work/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/...work/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
@@ -894,6 +894,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"
+            );
         }
     }
 

diff --git a/...peniddict/src/Volo.Abp.OpenIddict.Domain/Volo/Abp/OpenIddict/AbpOpenIddictDomainModule.cs b/...peniddict/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)
+            );
         });
     }
 }