Merge pull request #21482 from abpframework/9.0-cmskit-settings

Move SettingManagement to the Admin side of CMS Kit
abpframework · Nov 29, 2024 · 6eecc8a · 6eecc8a
2 parents fb46255 + 3af67ad
commit 6eecc8a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
@@ -13,6 +13,7 @@
 using Volo.Abp.Modularity;
 using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectExtending.Modularity;
+using Volo.Abp.SettingManagement.Web;
 using Volo.Abp.SettingManagement.Web.Pages.SettingManagement;
 using Volo.Abp.Threading;
 using Volo.Abp.UI.Navigation;
@@ -29,7 +30,8 @@ namespace Volo.CmsKit.Admin.Web;
 
 [DependsOn(
     typeof(CmsKitAdminApplicationContractsModule),
-    typeof(CmsKitCommonWebModule)
+    typeof(CmsKitCommonWebModule),
+    typeof(AbpSettingManagementWebModule)
     )]
 public class CmsKitAdminWebModule : AbpModule
 {

diff --git a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj
@@ -15,6 +15,8 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Admin.Application.Contracts\Volo.CmsKit.Admin.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj" />
+
   </ItemGroup>
 
   <ItemGroup>

diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs b/modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs
@@ -7,15 +7,13 @@
 using Volo.CmsKit.Web.Icons;
 using Markdig;
 using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.SettingManagement.Web;
 
 namespace Volo.CmsKit.Web;
 
 [DependsOn(
     typeof(AbpAspNetCoreMvcUiThemeSharedModule),
     typeof(CmsKitCommonApplicationContractsModule),
-    typeof(AbpAutoMapperModule),
-    typeof(AbpSettingManagementWebModule)
+    typeof(AbpAutoMapperModule)
     )]
 public class CmsKitCommonWebModule : AbpModule
 {

diff --git a/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj b/modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj
@@ -16,7 +16,6 @@
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared\Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj" />
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AutoMapper\Volo.Abp.AutoMapper.csproj" />
     <ProjectReference Include="..\Volo.CmsKit.Common.Application.Contracts\Volo.CmsKit.Common.Application.Contracts.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Web/Volo.Abp.SettingManagement.Web.csproj" />
   </ItemGroup>
 
   <ItemGroup>