From ffc3f735951073867b8a00245c9baa29094bf43d Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Mon, 24 Jul 2023 00:50:23 +0800 Subject: [PATCH] Upgrade to ABP 7.3.0 --- Directory.Build.props | 2 +- common.props | 2 +- sample/MyAbpApp/src/MyAbpApp.Web/package.json | 2 +- sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock | 8 ++++---- .../AbpSettingUiDomainSharedModule.cs | 2 ++ .../EasyAbp.Abp.SettingUi.Domain.Shared.csproj | 1 + 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e0c62c6..7c9adc8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.2.1 + 7.3.0 \ No newline at end of file diff --git a/common.props b/common.props index 6a9a3e8..85b5597 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.10.0 + 1.11.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/package.json b/sample/MyAbpApp/src/MyAbpApp.Web/package.json index 330a0b3..24d9c85 100644 --- a/sample/MyAbpApp/src/MyAbpApp.Web/package.json +++ b/sample/MyAbpApp/src/MyAbpApp.Web/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.2.0-rc.1" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.3.0" } } \ No newline at end of file diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock b/sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock index cb75152..fcadd90 100644 --- a/sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock +++ b/sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock @@ -2,10 +2,10 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.2.0-rc.1": - version "2.2.0" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.2.0.tgz#dc76d1d869e16876288c90f5fec31df3a99bb628" - integrity sha512-mAAptSqGWQu+GefI1XHlP7KF8PncWreuC9u09rUdZ1cixFURy7PaG/n/QMNj9YJSVIb+vPsnFjYDeTtNbrxU/g== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.3.0": + version "2.3.0" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.3.0.tgz#7e05ce2a897de0f0bb016e0ae4a9adfd0260e7be" + integrity sha512-d7p8Pv6g8aocjBIBKHMF8fFDeVzWqkriz6uKy3oowCKSe5tqzq3j35Um7kEu7DapPf9MyBPq8+z9VsGbxJCjww== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/src/EasyAbp.Abp.SettingUi.Domain.Shared/AbpSettingUiDomainSharedModule.cs b/src/EasyAbp.Abp.SettingUi.Domain.Shared/AbpSettingUiDomainSharedModule.cs index 675ca0b..b1f876b 100644 --- a/src/EasyAbp.Abp.SettingUi.Domain.Shared/AbpSettingUiDomainSharedModule.cs +++ b/src/EasyAbp.Abp.SettingUi.Domain.Shared/AbpSettingUiDomainSharedModule.cs @@ -1,4 +1,5 @@ using EasyAbp.Abp.SettingUi.Localization; +using Volo.Abp.Domain; using Volo.Abp.Modularity; using Volo.Abp.Localization; using Volo.Abp.SettingManagement; @@ -12,6 +13,7 @@ namespace EasyAbp.Abp.SettingUi { [DependsOn( typeof(AbpValidationModule), + typeof(AbpDddDomainSharedModule), typeof(AbpUiModule), typeof(AbpSettingManagementDomainSharedModule) )] diff --git a/src/EasyAbp.Abp.SettingUi.Domain.Shared/EasyAbp.Abp.SettingUi.Domain.Shared.csproj b/src/EasyAbp.Abp.SettingUi.Domain.Shared/EasyAbp.Abp.SettingUi.Domain.Shared.csproj index 53c0a6d..32e81dc 100644 --- a/src/EasyAbp.Abp.SettingUi.Domain.Shared/EasyAbp.Abp.SettingUi.Domain.Shared.csproj +++ b/src/EasyAbp.Abp.SettingUi.Domain.Shared/EasyAbp.Abp.SettingUi.Domain.Shared.csproj @@ -11,6 +11,7 @@ +