From e9f592151528739c94a914c3a7a4f0c521f6d084 Mon Sep 17 00:00:00 2001 From: gdlcf88 Date: Thu, 19 Oct 2023 20:03:54 +0800 Subject: [PATCH] Upgrade to ABP 7.4.0 --- Directory.Build.props | 2 +- common.props | 2 +- .../src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj | 2 +- .../MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj | 2 +- .../MyAbpApp.EntityFrameworkCore.csproj | 2 +- sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj | 4 ++-- sample/MyAbpApp/src/MyAbpApp.Web/package.json | 2 +- sample/MyAbpApp/src/MyAbpApp.Web/yarn.lock | 8 ++++---- .../test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj | 2 +- .../EasyAbp.Abp.SettingUi.Application.Contracts.csproj | 2 +- .../SettingUiAppService.cs | 6 +++--- .../EasyAbp.Abp.SettingUi.Domain.Shared.csproj | 4 ++-- .../EasyAbp.Abp.SettingUi.Domain.csproj | 2 +- .../EasyAbp.Abp.SettingUi.HttpApi.Client.csproj | 2 +- .../EasyAbp.Abp.SettingUi.Web.csproj | 2 +- .../SettingUi/SettingDefinitionGroupAppService_Tests.cs | 8 ++++---- .../SettingProperties/SettingProperty_Tests.cs | 7 ++----- .../EasyAbp.Abp.SettingUi.TestBase.csproj | 3 ++- .../SettingUiTestBaseModule.cs | 9 ++++----- 19 files changed, 34 insertions(+), 37 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 7c9adc8..e81b043 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,7 +1,7 @@ - 7.3.0 + 7.4.0 \ No newline at end of file diff --git a/common.props b/common.props index 85b5597..7162801 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 1.11.0 + 1.12.0 $(NoWarn);CS1591 true EasyAbp Team diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj index 4ae0165..9892e3a 100644 --- a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj +++ b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/MyAbpApp.DbMigrator.csproj @@ -17,7 +17,7 @@ - + diff --git a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj index 3c99262..1f215e6 100644 --- a/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj +++ b/sample/MyAbpApp/src/MyAbpApp.Domain.Shared/MyAbpApp.Domain.Shared.csproj @@ -27,7 +27,7 @@ - + diff --git a/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj b/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj index 8c360a2..e6e6864 100644 --- a/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj +++ b/sample/MyAbpApp/src/MyAbpApp.EntityFrameworkCore/MyAbpApp.EntityFrameworkCore.csproj @@ -21,7 +21,7 @@ - + runtime; build; native; contentfiles; analyzers compile; contentFiles; build; buildMultitargeting; buildTransitive; analyzers; native diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj index c662b85..5102199 100644 --- a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj +++ b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj @@ -33,7 +33,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/package.json b/sample/MyAbpApp/src/MyAbpApp.Web/package.json index 24d9c85..2f90441 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.3.0" + "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~2.4.1" } } \ 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 fcadd90..dfea055 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.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== +"@abp/aspnetcore.mvc.ui.theme.leptonxlite@~2.4.1": + version "2.4.1" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.leptonxlite/-/aspnetcore.mvc.ui.theme.leptonxlite-2.4.1.tgz#414d28d6347aecc7a0246ada8dfa2f447781613c" + integrity sha512-qbWEVchynWGGvGbXP/M6KGJHy0ip3DlIIvkBpaCld6n1aisizJ9lz8yatMb/BKVwejPqOROtOOCYRJiz4oI0WA== dependencies: "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.1" diff --git a/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj b/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj index a07bc6d..2b356d2 100644 --- a/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj +++ b/sample/MyAbpApp/test/MyAbpApp.TestBase/MyAbpApp.TestBase.csproj @@ -17,7 +17,7 @@ - + diff --git a/src/EasyAbp.Abp.SettingUi.Application.Contracts/EasyAbp.Abp.SettingUi.Application.Contracts.csproj b/src/EasyAbp.Abp.SettingUi.Application.Contracts/EasyAbp.Abp.SettingUi.Application.Contracts.csproj index 10a6d9a..779d3bd 100644 --- a/src/EasyAbp.Abp.SettingUi.Application.Contracts/EasyAbp.Abp.SettingUi.Application.Contracts.csproj +++ b/src/EasyAbp.Abp.SettingUi.Application.Contracts/EasyAbp.Abp.SettingUi.Application.Contracts.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 EasyAbp.Abp.SettingUi diff --git a/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs b/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs index 495992a..921d954 100644 --- a/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs +++ b/src/EasyAbp.Abp.SettingUi.Application/SettingUiAppService.cs @@ -124,7 +124,7 @@ public virtual async Task SetSettingValuesAsync(Dictionary setti } string name = pascalCaseName.RemovePreFix(SettingUiConst.FormNamePrefix).UnderscoreToDot(); - var setting = _settingDefinitionManager.GetOrNull(name); + var setting = await _settingDefinitionManager.GetOrNullAsync(name); if (setting == null) { continue; @@ -138,7 +138,7 @@ public virtual async Task ResetSettingValuesAsync(List settingNames) { foreach (var name in settingNames) { - var setting = _settingDefinitionManager.GetOrNull(name); + var setting = await _settingDefinitionManager.GetOrNullAsync(name); if (setting == null) { continue; @@ -177,7 +177,7 @@ protected virtual Task SetSettingAsync(SettingDefinition setting, string value) protected virtual async Task> SetSettingDefinitionPropertiesAsync(IDictionary> settingProperties, IList permissionDefinitions) { var settingInfos = new List(); - var settingDefinitions = _settingDefinitionManager.GetAll(); + var settingDefinitions = await _settingDefinitionManager.GetAllAsync(); foreach (var settingDefinition in settingDefinitions) { var si = await CreateSettingInfoAsync(settingDefinition); 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 32e81dc..a2bb152 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 @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 EasyAbp.Abp.SettingUi true @@ -30,7 +30,7 @@ - + diff --git a/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj b/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj index 13afa08..3032c92 100644 --- a/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj +++ b/src/EasyAbp.Abp.SettingUi.Domain/EasyAbp.Abp.SettingUi.Domain.csproj @@ -3,7 +3,7 @@ - net7.0 + netstandard2.0;netstandard2.1;net7.0 EasyAbp.Abp.SettingUi diff --git a/src/EasyAbp.Abp.SettingUi.HttpApi.Client/EasyAbp.Abp.SettingUi.HttpApi.Client.csproj b/src/EasyAbp.Abp.SettingUi.HttpApi.Client/EasyAbp.Abp.SettingUi.HttpApi.Client.csproj index f6cfcee..e37f643 100644 --- a/src/EasyAbp.Abp.SettingUi.HttpApi.Client/EasyAbp.Abp.SettingUi.HttpApi.Client.csproj +++ b/src/EasyAbp.Abp.SettingUi.HttpApi.Client/EasyAbp.Abp.SettingUi.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - netstandard2.0 + netstandard2.0;netstandard2.1;net7.0 EasyAbp.Abp.SettingUi diff --git a/src/EasyAbp.Abp.SettingUi.Web/EasyAbp.Abp.SettingUi.Web.csproj b/src/EasyAbp.Abp.SettingUi.Web/EasyAbp.Abp.SettingUi.Web.csproj index bf2e6eb..75d3197 100644 --- a/src/EasyAbp.Abp.SettingUi.Web/EasyAbp.Abp.SettingUi.Web.csproj +++ b/src/EasyAbp.Abp.SettingUi.Web/EasyAbp.Abp.SettingUi.Web.csproj @@ -22,7 +22,7 @@ - + diff --git a/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUi/SettingDefinitionGroupAppService_Tests.cs b/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUi/SettingDefinitionGroupAppService_Tests.cs index 101e85c..b47d124 100644 --- a/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUi/SettingDefinitionGroupAppService_Tests.cs +++ b/test/EasyAbp.Abp.SettingUi.Application.Tests/SettingUi/SettingDefinitionGroupAppService_Tests.cs @@ -35,15 +35,15 @@ protected override void AfterAddApplication(IServiceCollection services) .WithProperty(SettingUiConst.Type, "number"); var setting2 = new SettingDefinition("Test.Setting2", "2"); var setting3 = new SettingDefinition("Test.Setting3", "3"); - settingDefinitionManager.GetAll().Returns(new List + settingDefinitionManager.GetAllAsync().Returns(new List { setting1, setting2, setting3 }); - settingDefinitionManager.GetOrNull("Test.Setting1").Returns(setting1); - settingDefinitionManager.GetOrNull("Test.Setting2").Returns(setting2); - settingDefinitionManager.GetOrNull("Test.Setting3").Returns(setting3); + settingDefinitionManager.GetOrNullAsync("Test.Setting1").Returns(setting1); + settingDefinitionManager.GetOrNullAsync("Test.Setting2").Returns(setting2); + settingDefinitionManager.GetOrNullAsync("Test.Setting3").Returns(setting3); services.AddSingleton(settingDefinitionManager); // Mock ISettingManager diff --git a/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingProperties/SettingProperty_Tests.cs b/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingProperties/SettingProperty_Tests.cs index ba290d9..96b0cdb 100644 --- a/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingProperties/SettingProperty_Tests.cs +++ b/test/EasyAbp.Abp.SettingUi.Domain.Tests/SettingProperties/SettingProperty_Tests.cs @@ -22,10 +22,10 @@ public SettingProperty_Tests(ITestOutputHelper output) } [Fact] - public Task BuiltIn_Setting_Properties_Should_Be_Defined() + public async Task BuiltIn_Setting_Properties_Should_Be_Defined() { // Arrange - var settingDefinitions = _settingDefinitionManager.GetAll(); + var settingDefinitions = await _settingDefinitionManager.GetAllAsync(); var fileInfo = GetRequiredService().GetFileInfo("/SettingProperties/AbpSettingUiSettingProperties.json"); var jsonSerializer = GetRequiredService(); @@ -38,9 +38,6 @@ public Task BuiltIn_Setting_Properties_Should_Be_Defined() _output.WriteLine($"Check property of the setting {settingDefinition.Name}"); propertyDict.ShouldContainKey(settingDefinition.Name, $"Setting property not found, setting name: {settingDefinition.Name}"); } - - - return Task.CompletedTask; } } } \ No newline at end of file diff --git a/test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj b/test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj index d0acc12..ab1dd43 100644 --- a/test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj +++ b/test/EasyAbp.Abp.SettingUi.TestBase/EasyAbp.Abp.SettingUi.TestBase.csproj @@ -8,9 +8,10 @@ - + + diff --git a/test/EasyAbp.Abp.SettingUi.TestBase/SettingUiTestBaseModule.cs b/test/EasyAbp.Abp.SettingUi.TestBase/SettingUiTestBaseModule.cs index 68525b5..d86cc8a 100644 --- a/test/EasyAbp.Abp.SettingUi.TestBase/SettingUiTestBaseModule.cs +++ b/test/EasyAbp.Abp.SettingUi.TestBase/SettingUiTestBaseModule.cs @@ -1,11 +1,9 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; +using Volo.Abp; using Volo.Abp.Authorization; using Volo.Abp.Autofac; -using Volo.Abp.Data; using Volo.Abp.Modularity; using Volo.Abp.SettingManagement; -using Volo.Abp.Threading; +using Volo.Abp.SettingManagement.EntityFrameworkCore; namespace EasyAbp.Abp.SettingUi { @@ -14,7 +12,8 @@ namespace EasyAbp.Abp.SettingUi typeof(AbpTestBaseModule), typeof(AbpAuthorizationModule), typeof(AbpSettingUiDomainModule), - typeof(AbpSettingManagementDomainModule) + typeof(AbpSettingManagementDomainModule), + typeof(AbpSettingManagementEntityFrameworkCoreModule) )] public class SettingUiTestBaseModule : AbpModule {