Browse Source
Merge pull request #21485 from abpframework/auto-merge/rel-9-0/3248
Merge branch dev with rel-9.0
pull/21488/head
maliming
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with
6 additions and
5 deletions
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/CmsKitAdminWebModule.cs
-
modules/cms-kit/src/Volo.CmsKit.Admin.Web/Volo.CmsKit.Admin.Web.csproj
-
modules/cms-kit/src/Volo.CmsKit.Common.Web/CmsKitCommonWebModule.cs
-
modules/cms-kit/src/Volo.CmsKit.Common.Web/Volo.CmsKit.Common.Web.csproj
|
|
|
@ -13,6 +13,7 @@ using Volo.Abp.Localization; |
|
|
|
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 |
|
|
|
{ |
|
|
|
|
|
|
|
@ -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> |
|
|
|
|
|
|
|
@ -7,15 +7,13 @@ using Volo.CmsKit.Reactions; |
|
|
|
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 |
|
|
|
{ |
|
|
|
|
|
|
|
@ -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> |
|
|
|
|
