From 83be13d2e9cb806a8960fc001a1d506b9c6014f9 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Sat, 15 Oct 2022 10:01:05 +0800 Subject: [PATCH] Upgrade to abp 6.0.0 --- configureawait.props | 2 +- ...re.Components.Server.AntDesignTheme.csproj | 6 +- ...tCore.Components.Web.AntDesignTheme.csproj | 2 +- ...mponents.WebAssembly.AntDesignTheme.csproj | 8 +- ...eatureManagement.Blazor.AntDesignUI.csproj | 6 +- ...ment.Blazor.WebAssembly.AntDesignUI.csproj | 2 +- ...entityManagement.Blazor.AntDesignUI.csproj | 4 +- ...ment.Blazor.WebAssembly.AntDesignUI.csproj | 2 +- ...issionManagement.Blazor.AntDesignUI.csproj | 4 +- ...ment.Blazor.WebAssembly.AntDesignUI.csproj | 2 +- ...ettingManagement.Blazor.AntDesignUI.csproj | 4 +- .../AntDesignSettingDefultPageContributor.cs | 2 +- ...ment.Blazor.WebAssembly.AntDesignUI.csproj | 2 +- ...TenantManagement.Blazor.AntDesignUI.csproj | 4 +- ...ment.Blazor.WebAssembly.AntDesignUI.csproj | 2 +- .../BookStore.Application.Contracts.csproj | 14 +- .../BookStore.Application.csproj | 12 +- .../BookStore.Blazor/BookStore.Blazor.csproj | 16 +- .../BookStore.BlazorServer.csproj | 12 +- .../Pages/Index.razor.cs | 11 +- .../src/BookStore.BlazorServer/package.json | 4 +- .../src/BookStore.BlazorServer/yarn.lock | 208 +++++++++--------- .../BookStore.DbMigrator.csproj | 2 +- .../BookStore.Domain.Shared.csproj | 18 +- .../BookStore.Domain/BookStore.Domain.csproj | 20 +- .../BookStore.EntityFrameworkCore.csproj | 18 +- .../BookStore.HttpApi.Client.csproj | 12 +- .../BookStore.HttpApi.Host.csproj | 14 +- .../src/BookStore.HttpApi.Host/package.json | 2 +- .../src/BookStore.HttpApi.Host/yarn.lock | 190 ++++++++-------- .../BookStore.HttpApi.csproj | 12 +- ...BookStore.EntityFrameworkCore.Tests.csproj | 2 +- ...Store.HttpApi.Client.ConsoleTestApp.csproj | 4 +- .../BookStore.TestBase.csproj | 6 +- .../AntDesignUiNotificationService.cs | 21 +- .../Lsw.Abp.AntDesignUI.csproj | 8 +- 36 files changed, 333 insertions(+), 325 deletions(-) diff --git a/configureawait.props b/configureawait.props index b0cf9ef..92f22f8 100644 --- a/configureawait.props +++ b/configureawait.props @@ -1,7 +1,7 @@ - + All runtime; build; native; contentfiles; analyzers diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj index 1ed8591..24a75c9 100644 --- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj +++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Server.AntDesignTheme.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj index b9c94c9..c34e1f4 100644 --- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj +++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme/Lsw.Abp.AspnetCore.Components.Web.AntDesignTheme.csproj @@ -9,7 +9,7 @@ - + diff --git a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj index 50fcb55..d894845 100644 --- a/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj +++ b/modules/AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme/Lsw.Abp.AspnetCore.Components.WebAssembly.AntDesignTheme.csproj @@ -12,10 +12,10 @@ - - - - + + + + diff --git a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj index f706f6a..27ce4af 100644 --- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj +++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.AntDesignUI.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj index 8e78e59..527345a 100644 --- a/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj +++ b/modules/FeatureManagement/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.FeatureManagement.Blazor.WebAssembly.AntDesignUI.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj index 930bc33..8a26ba8 100644 --- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj +++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.AntDesignUI.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj index 8e96e89..e7d8b09 100644 --- a/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj +++ b/modules/IdentityManagement/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.IdentityManagement.Blazor.WebAssembly.AntDesignUI.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj index d2c0abb..0e44463 100644 --- a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj +++ b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.AntDesignUI.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj index 299dd98..48b5853 100644 --- a/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj +++ b/modules/PermissionManagement/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.PermissionManagement.Blazor.WebAssembly.AntDesignUI.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj index 476c002..3a9c87e 100644 --- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj +++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.AntDesignUI.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Settings/AntDesignSettingDefultPageContributor.cs b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Settings/AntDesignSettingDefultPageContributor.cs index f67f3b2..6d2613a 100644 --- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Settings/AntDesignSettingDefultPageContributor.cs +++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.AntDesignUI/Settings/AntDesignSettingDefultPageContributor.cs @@ -67,7 +67,7 @@ public class AntDesignSettingDefultPageContributor : ISettingComponentContributo var featureCheck = context.ServiceProvider.GetRequiredService(); - return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowTenantsToChangeEmailSettings); + return await featureCheck.IsEnabledAsync(SettingManagementFeatures.AllowChangingEmailSettings); } } diff --git a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj index 86ec957..ef7716d 100644 --- a/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj +++ b/modules/SettingManagement/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.SettingManagement.Blazor.WebAssembly.AntDesignUI.csproj @@ -8,7 +8,7 @@ - + diff --git a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj index 3496f2c..91d2b89 100644 --- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj +++ b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.AntDesignUI.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj index f72f535..ab413fb 100644 --- a/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj +++ b/modules/TenantManagement/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI/Lsw.Abp.TenantManagement.Blazor.WebAssembly.AntDesignUI.csproj @@ -8,7 +8,7 @@ - + diff --git a/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj b/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj index 3bb4b77..7a4efae 100644 --- a/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj +++ b/samples/BookStore/src/BookStore.Application.Contracts/BookStore.Application.Contracts.csproj @@ -12,13 +12,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj b/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj index 2ed9e9d..d88346e 100644 --- a/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj +++ b/samples/BookStore/src/BookStore.Application/BookStore.Application.csproj @@ -13,12 +13,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj index 07b65e3..2b79017 100644 --- a/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj +++ b/samples/BookStore/src/BookStore.Blazor/BookStore.Blazor.csproj @@ -10,19 +10,19 @@ - - - + + + - - + + - - - + + + diff --git a/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj b/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj index f24033c..3a5249f 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj +++ b/samples/BookStore/src/BookStore.BlazorServer/BookStore.BlazorServer.csproj @@ -24,12 +24,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.BlazorServer/Pages/Index.razor.cs b/samples/BookStore/src/BookStore.BlazorServer/Pages/Index.razor.cs index e6060a8..54f179e 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/Pages/Index.razor.cs +++ b/samples/BookStore/src/BookStore.BlazorServer/Pages/Index.razor.cs @@ -1,4 +1,13 @@ -namespace BookStore.Blazor.Pages; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using System.Text.Json; +using System.Threading.Tasks; +using AntDesign; +using AntDesign.TableModels; + +namespace BookStore.BlazorServer.Pages; public partial class Index { diff --git a/samples/BookStore/src/BookStore.BlazorServer/package.json b/samples/BookStore/src/BookStore.BlazorServer/package.json index ddf6820..4322d50 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/package.json +++ b/samples/BookStore/src/BookStore.BlazorServer/package.json @@ -3,7 +3,7 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.2.2", - "@abp/aspnetcore.components.server.basictheme": "~5.2.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0", + "@abp/aspnetcore.components.server.basictheme": "~6.0.0" } } \ No newline at end of file diff --git a/samples/BookStore/src/BookStore.BlazorServer/yarn.lock b/samples/BookStore/src/BookStore.BlazorServer/yarn.lock index 36ebac6..b4d11fa 100644 --- a/samples/BookStore/src/BookStore.BlazorServer/yarn.lock +++ b/samples/BookStore/src/BookStore.BlazorServer/yarn.lock @@ -2,51 +2,51 @@ # yarn lockfile v1 -"@abp/aspnetcore.components.server.basictheme@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-5.2.2.tgz#e485b51b3cd37bbed461f5414c0fb9ab078b5cf8" +"@abp/aspnetcore.components.server.basictheme@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.basictheme/-/aspnetcore.components.server.basictheme-6.0.0.tgz#e485b51b3cd37bbed461f5414c0fb9ab078b5cf8" integrity sha512-bLJ+bhpy8HG7rRRRjVfMXR6wKGCUCmOin40L86O12bcOgVPJshAJCuAjcLdzvEJ06hh1MtNtsjHHokcSs4ER0g== dependencies: - "@abp/aspnetcore.components.server.theming" "~5.2.2" + "@abp/aspnetcore.components.server.theming" "~6.0.0" -"@abp/aspnetcore.components.server.theming@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-5.2.2.tgz#3bf2d1b0bd35bac49efd6af0633d45fca711a3b9" +"@abp/aspnetcore.components.server.theming@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.components.server.theming/-/aspnetcore.components.server.theming-6.0.0.tgz#3bf2d1b0bd35bac49efd6af0633d45fca711a3b9" integrity sha512-sbpL9sTQxNE6nbeptIUyN2iJc2emQSnYl/9Bl8bLlqAkNdSY0m46n46LZ61ABgGHXCxY/ZnHX6QpB1ALcqVDJA== dependencies: - "@abp/bootstrap" "~5.2.2" - "@abp/font-awesome" "~5.2.2" + "@abp/bootstrap" "~6.0.0" + "@abp/font-awesome" "~6.0.0" -"@abp/aspnetcore.mvc.ui.theme.basic@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.2.2.tgz#c3306d23bf3e3b7ebca8793d207d716bb7e42d3c" +"@abp/aspnetcore.mvc.ui.theme.basic@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#c3306d23bf3e3b7ebca8793d207d716bb7e42d3c" integrity sha512-F6Yml17KeRkiq3Gk7/f9BRA5Z3RMW8Kn0khfCZolERBqm5mxi69VPWHLsGFBZDfNIW5YRuC+JkxaJ2yO9xnOKg== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.2.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.2.2.tgz#103215c25babf38cd1f0e1d97df729eb7e8b225c" +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#103215c25babf38cd1f0e1d97df729eb7e8b225c" integrity sha512-G8NsdK3exme6qNUUe4/7iNGyZB3l91sxFwj0Fd2dOAUu9m+IhA5vF2Eo50w+SGTAWYbwEBlEIM5eA2hWaSrPfA== dependencies: - "@abp/aspnetcore.mvc.ui" "~5.2.2" - "@abp/bootstrap" "~5.2.2" - "@abp/bootstrap-datepicker" "~5.2.2" - "@abp/datatables.net-bs5" "~5.2.2" - "@abp/font-awesome" "~5.2.2" - "@abp/jquery-form" "~5.2.2" - "@abp/jquery-validation-unobtrusive" "~5.2.2" - "@abp/lodash" "~5.2.2" - "@abp/luxon" "~5.2.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.2.2" - "@abp/select2" "~5.2.2" - "@abp/sweetalert2" "~5.2.2" - "@abp/timeago" "~5.2.2" - "@abp/toastr" "~5.2.2" - -"@abp/aspnetcore.mvc.ui@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.2.2.tgz#35faf51af65791b578212fdb42d350700501428b" + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#35faf51af65791b578212fdb42d350700501428b" integrity sha512-TrvfBvKvei3uyJtiO4gEMlbPpvPJ98ggW5Ilb/0olx3H9qHgMvtQbusDN0qW2e9xkHL7GbRJUk4jxYP9tThiyw== dependencies: ansi-colors "^4.1.1" @@ -56,143 +56,143 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.2.2.tgz#0612a6056617acfaed862528fdeab1e792675b05" +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#0612a6056617acfaed862528fdeab1e792675b05" integrity sha512-237UInHlY381a4anJ3nfvwa2JmlFFpitNQFJl/E8KVYvhy+3wswnv4linVmGWYtPd3diwmpcDwqONYPQ+KdxPw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.2.2.tgz#e28b52e4b9e09746eab881524f612d1771d7df35" +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#e28b52e4b9e09746eab881524f612d1771d7df35" integrity sha512-LzzTBzRzjHdLZNhDe5By1kWD4KD08U725AfU37MlscyvrcIjjrU9s6P9TGgaXnHk00X5ddJlnYUx08V1SNEZhQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.2.2.tgz#51a995bb5f9b89c7709633d131a4ef7c10686770" +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#51a995bb5f9b89c7709633d131a4ef7c10686770" integrity sha512-rxvzVEPwZGOgvCak8VRpM2Bv48LLVJcGG8kmxbaLbwg1HuZH1KZVT5QvNZBvPjzcS93jly79aGElQrDoAOMv/A== dependencies: - "@abp/utils" "~5.2.2" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.2.2.tgz#f4cf02ac91c533ca042cb531b45686588ba4cec1" +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f4cf02ac91c533ca042cb531b45686588ba4cec1" integrity sha512-OQTcNf/rm+/o3XlicKTs/eanLaaBgIdxnddMpZbNVGHJl9GAYww4d+7hwDibwcy4QWbM4EYB2q2+KTDmbwFZvg== dependencies: - "@abp/datatables.net" "~5.2.2" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.2.2.tgz#be0c5f09825c4635906217e66ddbea52f9bcb036" +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#be0c5f09825c4635906217e66ddbea52f9bcb036" integrity sha512-7Cvt5hL1K0F3FRpZhYw1otmLnotcsddocsri1jvMAGMUnJMzHwIax7FHACtG6QstSJjKJ3AIRrS4K8ofgN6WmA== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.2.2.tgz#27e32192eb21c4b248dfc42c9a060524e1987f52" +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#27e32192eb21c4b248dfc42c9a060524e1987f52" integrity sha512-f2hy6f4yI8+HnxQTTnvBP6le3mJ/daaqSdP5LPNWNCuzWL7pkrBSFkeNX4ADSpoC8KDUjMWMY0WMBJLoDH9NFQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.2.2.tgz#a35448eacc8dd57f682cbfbd2437b123343a8d5e" +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#a35448eacc8dd57f682cbfbd2437b123343a8d5e" integrity sha512-AC+vwIj7+yMv+34XmyzGi2oB4yIxJyb+2VrQJihERfXG2AHV5yEWITun3jFO8aLd1PBos6QcL81CQtXSYz2deg== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.2.2.tgz#bc29269a1f6577c7ee13930af5c2cf598db13286" +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#bc29269a1f6577c7ee13930af5c2cf598db13286" integrity sha512-K8n73+mphz5mr2x3iKJBNoaMqWbG9yZLIpo28nViuLDaqYy0tmLO38Pfv6dzmFcuniGHaw/kh2VKBWEM42qcRQ== dependencies: - "@abp/jquery-validation" "~5.2.2" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.2.2.tgz#ebacb0a6dde929881a5f0651231b175ca76abd47" +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#ebacb0a6dde929881a5f0651231b175ca76abd47" integrity sha512-BHgbwdlRBl5ZDudfKfdiL9RgpY0l+x6y/R+a1Vb5OZPSxrnCaPPYHyFWNqS+UoX+QDDAHIwaAiVxrRWMCGoT4Q== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.2.2.tgz#ec4fb478760801b31822de38689e542877c81cc2" +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#ec4fb478760801b31822de38689e542877c81cc2" integrity sha512-PPHE6V1q2ebAG8X/pwkP024rzclwX/qh3/QjJ02kUPgRdhtEroqyYcinBiuZPXHCVgKr5hz0wDldXZRhSN2dhA== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.2.2.tgz#85605092b645be23dcf11a7d829f1431b554e840" +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#85605092b645be23dcf11a7d829f1431b554e840" integrity sha512-bkeW/imDeGc1tkhwnRCX3BXRMumdK8Ys2v+njZ6Vrce5zygGStv1pRr7uuA7nu5puLHF5JIHhybMRaynJBpzxg== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.2.2.tgz#2ebeee50ccdb12716e056464bac893fa0512ddd6" +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#2ebeee50ccdb12716e056464bac893fa0512ddd6" integrity sha512-oWXiAtaDpi7A5m2cDm6B1ibfskCh7Rc//xfeJ4mIOExvrrnwTzcTCuQeGlNF0bWnl4qYufR8UQxgdqkJAK0cxw== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.2.2.tgz#a3a0fcaa054effa3574b96647509978b8dc0d267" +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#a3a0fcaa054effa3574b96647509978b8dc0d267" integrity sha512-k0mUxAnJQn0uY/v+dc836TKNmHBkfMMQTu/zcmUSzepxuzo6eaYeyfGT4/vOhYiB3o6OB3N7KHGm2dFIBHzjmg== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.2.2.tgz#476fcd222166bc36396d4f4b9d87c0e78763a7ed" +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#476fcd222166bc36396d4f4b9d87c0e78763a7ed" integrity sha512-a25/vriOqawpwF12wAXWNuRNU9MF5SJL54p07EKt6wNFdxYXWLiDqt4HntLdHFJJ/DPrX52/mh22/fAnLFjjvQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.2.2.tgz#3232b1faf33426289096178318fa0224d48d816b" +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#3232b1faf33426289096178318fa0224d48d816b" integrity sha512-EpHCa9xtiZQMfQUSXn1G14qihUjRlYWm1uSiMY5qrhHr9sn5E5sGNZNsWslqbtdFJoyP1gcNS0/SWHBFX8eEiw== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.2.2.tgz#bf9e680411fd3f1aaee5e0f56aa8747fb247ad27" +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#bf9e680411fd3f1aaee5e0f56aa8747fb247ad27" integrity sha512-6VZh+k+IGcFrCkzoBiEOVdFz09IehC9UzITkaFG6qulQpiciPhYjsJ5XUVj9Xtc/mORSc3in+5nBLA0CXMtHgg== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.2.2.tgz#a1154a812427d3967e9e9652b8d83852b1714286" +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#a1154a812427d3967e9e9652b8d83852b1714286" integrity sha512-iD0tY/Oi/+otCuB8+6rfc1qsbwZCGbIc6pXRq0L8fwgMTjPfxYDV96YTIEDr0SXYB++itqy52SBx8jYLcbkC2g== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.2.2.tgz#3926edb783cef24ceb821bf63a1d4d34180c825f" +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#3926edb783cef24ceb821bf63a1d4d34180c825f" integrity sha512-qrinQLM3fdearXAh15k2C9uk6OnUaQoF7gSUjnbQKRLbBh5bgeOYbA/YRh8UcIKzVfUBJpGaebv+mbnGY/n2IQ== dependencies: just-compare "^1.3.0" diff --git a/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj b/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj index b187e7f..532dbcd 100644 --- a/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj +++ b/samples/BookStore/src/BookStore.DbMigrator/BookStore.DbMigrator.csproj @@ -28,7 +28,7 @@ - + diff --git a/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj b/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj index 1060366..206db11 100644 --- a/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj +++ b/samples/BookStore/src/BookStore.Domain.Shared/BookStore.Domain.Shared.csproj @@ -9,14 +9,14 @@ - - - - - - - - + + + + + + + + @@ -25,7 +25,7 @@ - + diff --git a/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj b/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj index 61fb9f4..40c3d26 100644 --- a/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj +++ b/samples/BookStore/src/BookStore.Domain/BookStore.Domain.csproj @@ -12,16 +12,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj b/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj index abe788f..d146df5 100644 --- a/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj +++ b/samples/BookStore/src/BookStore.EntityFrameworkCore/BookStore.EntityFrameworkCore.csproj @@ -9,15 +9,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj b/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj index 0c0fde3..d7b7e14 100644 --- a/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj +++ b/samples/BookStore/src/BookStore.HttpApi.Client/BookStore.HttpApi.Client.csproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj b/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj index 8557602..b368299 100644 --- a/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj +++ b/samples/BookStore/src/BookStore.HttpApi.Host/BookStore.HttpApi.Host.csproj @@ -12,13 +12,13 @@ - - - - - - - + + + + + + + diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/package.json b/samples/BookStore/src/BookStore.HttpApi.Host/package.json index fb082e0..decdbc8 100644 --- a/samples/BookStore/src/BookStore.HttpApi.Host/package.json +++ b/samples/BookStore/src/BookStore.HttpApi.Host/package.json @@ -3,6 +3,6 @@ "name": "my-app", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~5.2.2" + "@abp/aspnetcore.mvc.ui.theme.basic": "~6.0.0" } } \ No newline at end of file diff --git a/samples/BookStore/src/BookStore.HttpApi.Host/yarn.lock b/samples/BookStore/src/BookStore.HttpApi.Host/yarn.lock index af7925e..3e282d3 100644 --- a/samples/BookStore/src/BookStore.HttpApi.Host/yarn.lock +++ b/samples/BookStore/src/BookStore.HttpApi.Host/yarn.lock @@ -2,36 +2,36 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-5.2.2.tgz#c3306d23bf3e3b7ebca8793d207d716bb7e42d3c" +"@abp/aspnetcore.mvc.ui.theme.basic@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-6.0.0.tgz#c3306d23bf3e3b7ebca8793d207d716bb7e42d3c" integrity sha512-F6Yml17KeRkiq3Gk7/f9BRA5Z3RMW8Kn0khfCZolERBqm5mxi69VPWHLsGFBZDfNIW5YRuC+JkxaJ2yO9xnOKg== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~5.2.2" + "@abp/aspnetcore.mvc.ui.theme.shared" "~6.0.0" -"@abp/aspnetcore.mvc.ui.theme.shared@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-5.2.2.tgz#103215c25babf38cd1f0e1d97df729eb7e8b225c" +"@abp/aspnetcore.mvc.ui.theme.shared@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-6.0.0.tgz#103215c25babf38cd1f0e1d97df729eb7e8b225c" integrity sha512-G8NsdK3exme6qNUUe4/7iNGyZB3l91sxFwj0Fd2dOAUu9m+IhA5vF2Eo50w+SGTAWYbwEBlEIM5eA2hWaSrPfA== dependencies: - "@abp/aspnetcore.mvc.ui" "~5.2.2" - "@abp/bootstrap" "~5.2.2" - "@abp/bootstrap-datepicker" "~5.2.2" - "@abp/datatables.net-bs5" "~5.2.2" - "@abp/font-awesome" "~5.2.2" - "@abp/jquery-form" "~5.2.2" - "@abp/jquery-validation-unobtrusive" "~5.2.2" - "@abp/lodash" "~5.2.2" - "@abp/luxon" "~5.2.2" - "@abp/malihu-custom-scrollbar-plugin" "~5.2.2" - "@abp/select2" "~5.2.2" - "@abp/sweetalert2" "~5.2.2" - "@abp/timeago" "~5.2.2" - "@abp/toastr" "~5.2.2" - -"@abp/aspnetcore.mvc.ui@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-5.2.2.tgz#35faf51af65791b578212fdb42d350700501428b" + "@abp/aspnetcore.mvc.ui" "~6.0.0" + "@abp/bootstrap" "~6.0.0" + "@abp/bootstrap-datepicker" "~6.0.0" + "@abp/datatables.net-bs5" "~6.0.0" + "@abp/font-awesome" "~6.0.0" + "@abp/jquery-form" "~6.0.0" + "@abp/jquery-validation-unobtrusive" "~6.0.0" + "@abp/lodash" "~6.0.0" + "@abp/luxon" "~6.0.0" + "@abp/malihu-custom-scrollbar-plugin" "~6.0.0" + "@abp/select2" "~6.0.0" + "@abp/sweetalert2" "~6.0.0" + "@abp/timeago" "~6.0.0" + "@abp/toastr" "~6.0.0" + +"@abp/aspnetcore.mvc.ui@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-6.0.0.tgz#35faf51af65791b578212fdb42d350700501428b" integrity sha512-TrvfBvKvei3uyJtiO4gEMlbPpvPJ98ggW5Ilb/0olx3H9qHgMvtQbusDN0qW2e9xkHL7GbRJUk4jxYP9tThiyw== dependencies: ansi-colors "^4.1.1" @@ -41,143 +41,143 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-5.2.2.tgz#0612a6056617acfaed862528fdeab1e792675b05" +"@abp/bootstrap-datepicker@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-6.0.0.tgz#0612a6056617acfaed862528fdeab1e792675b05" integrity sha512-237UInHlY381a4anJ3nfvwa2JmlFFpitNQFJl/E8KVYvhy+3wswnv4linVmGWYtPd3diwmpcDwqONYPQ+KdxPw== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-5.2.2.tgz#e28b52e4b9e09746eab881524f612d1771d7df35" +"@abp/bootstrap@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/bootstrap/-/bootstrap-6.0.0.tgz#e28b52e4b9e09746eab881524f612d1771d7df35" integrity sha512-LzzTBzRzjHdLZNhDe5By1kWD4KD08U725AfU37MlscyvrcIjjrU9s6P9TGgaXnHk00X5ddJlnYUx08V1SNEZhQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" bootstrap "^5.1.3" -"@abp/core@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/core/-/core-5.2.2.tgz#51a995bb5f9b89c7709633d131a4ef7c10686770" +"@abp/core@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/core/-/core-6.0.0.tgz#51a995bb5f9b89c7709633d131a4ef7c10686770" integrity sha512-rxvzVEPwZGOgvCak8VRpM2Bv48LLVJcGG8kmxbaLbwg1HuZH1KZVT5QvNZBvPjzcS93jly79aGElQrDoAOMv/A== dependencies: - "@abp/utils" "~5.2.2" + "@abp/utils" "~6.0.0" -"@abp/datatables.net-bs5@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-5.2.2.tgz#f4cf02ac91c533ca042cb531b45686588ba4cec1" +"@abp/datatables.net-bs5@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net-bs5/-/datatables.net-bs5-6.0.0.tgz#f4cf02ac91c533ca042cb531b45686588ba4cec1" integrity sha512-OQTcNf/rm+/o3XlicKTs/eanLaaBgIdxnddMpZbNVGHJl9GAYww4d+7hwDibwcy4QWbM4EYB2q2+KTDmbwFZvg== dependencies: - "@abp/datatables.net" "~5.2.2" + "@abp/datatables.net" "~6.0.0" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-5.2.2.tgz#be0c5f09825c4635906217e66ddbea52f9bcb036" +"@abp/datatables.net@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/datatables.net/-/datatables.net-6.0.0.tgz#be0c5f09825c4635906217e66ddbea52f9bcb036" integrity sha512-7Cvt5hL1K0F3FRpZhYw1otmLnotcsddocsri1jvMAGMUnJMzHwIax7FHACtG6QstSJjKJ3AIRrS4K8ofgN6WmA== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" datatables.net "^1.11.4" -"@abp/font-awesome@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-5.2.2.tgz#27e32192eb21c4b248dfc42c9a060524e1987f52" +"@abp/font-awesome@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/font-awesome/-/font-awesome-6.0.0.tgz#27e32192eb21c4b248dfc42c9a060524e1987f52" integrity sha512-f2hy6f4yI8+HnxQTTnvBP6le3mJ/daaqSdP5LPNWNCuzWL7pkrBSFkeNX4ADSpoC8KDUjMWMY0WMBJLoDH9NFQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-5.2.2.tgz#a35448eacc8dd57f682cbfbd2437b123343a8d5e" +"@abp/jquery-form@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-form/-/jquery-form-6.0.0.tgz#a35448eacc8dd57f682cbfbd2437b123343a8d5e" integrity sha512-AC+vwIj7+yMv+34XmyzGi2oB4yIxJyb+2VrQJihERfXG2AHV5yEWITun3jFO8aLd1PBos6QcL81CQtXSYz2deg== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-5.2.2.tgz#bc29269a1f6577c7ee13930af5c2cf598db13286" +"@abp/jquery-validation-unobtrusive@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-6.0.0.tgz#bc29269a1f6577c7ee13930af5c2cf598db13286" integrity sha512-K8n73+mphz5mr2x3iKJBNoaMqWbG9yZLIpo28nViuLDaqYy0tmLO38Pfv6dzmFcuniGHaw/kh2VKBWEM42qcRQ== dependencies: - "@abp/jquery-validation" "~5.2.2" + "@abp/jquery-validation" "~6.0.0" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-5.2.2.tgz#ebacb0a6dde929881a5f0651231b175ca76abd47" +"@abp/jquery-validation@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery-validation/-/jquery-validation-6.0.0.tgz#ebacb0a6dde929881a5f0651231b175ca76abd47" integrity sha512-BHgbwdlRBl5ZDudfKfdiL9RgpY0l+x6y/R+a1Vb5OZPSxrnCaPPYHyFWNqS+UoX+QDDAHIwaAiVxrRWMCGoT4Q== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" jquery-validation "^1.19.3" -"@abp/jquery@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-5.2.2.tgz#ec4fb478760801b31822de38689e542877c81cc2" +"@abp/jquery@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/jquery/-/jquery-6.0.0.tgz#ec4fb478760801b31822de38689e542877c81cc2" integrity sha512-PPHE6V1q2ebAG8X/pwkP024rzclwX/qh3/QjJ02kUPgRdhtEroqyYcinBiuZPXHCVgKr5hz0wDldXZRhSN2dhA== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" jquery "~3.6.0" -"@abp/lodash@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-5.2.2.tgz#85605092b645be23dcf11a7d829f1431b554e840" +"@abp/lodash@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/lodash/-/lodash-6.0.0.tgz#85605092b645be23dcf11a7d829f1431b554e840" integrity sha512-bkeW/imDeGc1tkhwnRCX3BXRMumdK8Ys2v+njZ6Vrce5zygGStv1pRr7uuA7nu5puLHF5JIHhybMRaynJBpzxg== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" lodash "^4.17.21" -"@abp/luxon@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-5.2.2.tgz#2ebeee50ccdb12716e056464bac893fa0512ddd6" +"@abp/luxon@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/luxon/-/luxon-6.0.0.tgz#2ebeee50ccdb12716e056464bac893fa0512ddd6" integrity sha512-oWXiAtaDpi7A5m2cDm6B1ibfskCh7Rc//xfeJ4mIOExvrrnwTzcTCuQeGlNF0bWnl4qYufR8UQxgdqkJAK0cxw== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-5.2.2.tgz#a3a0fcaa054effa3574b96647509978b8dc0d267" +"@abp/malihu-custom-scrollbar-plugin@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-6.0.0.tgz#a3a0fcaa054effa3574b96647509978b8dc0d267" integrity sha512-k0mUxAnJQn0uY/v+dc836TKNmHBkfMMQTu/zcmUSzepxuzo6eaYeyfGT4/vOhYiB3o6OB3N7KHGm2dFIBHzjmg== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/select2@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-5.2.2.tgz#476fcd222166bc36396d4f4b9d87c0e78763a7ed" +"@abp/select2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/select2/-/select2-6.0.0.tgz#476fcd222166bc36396d4f4b9d87c0e78763a7ed" integrity sha512-a25/vriOqawpwF12wAXWNuRNU9MF5SJL54p07EKt6wNFdxYXWLiDqt4HntLdHFJJ/DPrX52/mh22/fAnLFjjvQ== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" select2 "^4.0.13" -"@abp/sweetalert2@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-5.2.2.tgz#3232b1faf33426289096178318fa0224d48d816b" +"@abp/sweetalert2@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/sweetalert2/-/sweetalert2-6.0.0.tgz#3232b1faf33426289096178318fa0224d48d816b" integrity sha512-EpHCa9xtiZQMfQUSXn1G14qihUjRlYWm1uSiMY5qrhHr9sn5E5sGNZNsWslqbtdFJoyP1gcNS0/SWHBFX8eEiw== dependencies: - "@abp/core" "~5.2.2" + "@abp/core" "~6.0.0" sweetalert2 "^11.3.6" -"@abp/timeago@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-5.2.2.tgz#bf9e680411fd3f1aaee5e0f56aa8747fb247ad27" +"@abp/timeago@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/timeago/-/timeago-6.0.0.tgz#bf9e680411fd3f1aaee5e0f56aa8747fb247ad27" integrity sha512-6VZh+k+IGcFrCkzoBiEOVdFz09IehC9UzITkaFG6qulQpiciPhYjsJ5XUVj9Xtc/mORSc3in+5nBLA0CXMtHgg== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" timeago "^1.6.7" -"@abp/toastr@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-5.2.2.tgz#a1154a812427d3967e9e9652b8d83852b1714286" +"@abp/toastr@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/toastr/-/toastr-6.0.0.tgz#a1154a812427d3967e9e9652b8d83852b1714286" integrity sha512-iD0tY/Oi/+otCuB8+6rfc1qsbwZCGbIc6pXRq0L8fwgMTjPfxYDV96YTIEDr0SXYB++itqy52SBx8jYLcbkC2g== dependencies: - "@abp/jquery" "~5.2.2" + "@abp/jquery" "~6.0.0" toastr "^2.1.4" -"@abp/utils@~5.2.2": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-5.2.2.tgz#3926edb783cef24ceb821bf63a1d4d34180c825f" +"@abp/utils@~6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@abp/utils/-/utils-6.0.0.tgz#3926edb783cef24ceb821bf63a1d4d34180c825f" integrity sha512-qrinQLM3fdearXAh15k2C9uk6OnUaQoF7gSUjnbQKRLbBh5bgeOYbA/YRh8UcIKzVfUBJpGaebv+mbnGY/n2IQ== dependencies: just-compare "^1.3.0" diff --git a/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj b/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj index cc2e5d0..d4e9c74 100644 --- a/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj +++ b/samples/BookStore/src/BookStore.HttpApi/BookStore.HttpApi.csproj @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj b/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj index e02d600..d839c83 100644 --- a/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj +++ b/samples/BookStore/test/BookStore.EntityFrameworkCore.Tests/BookStore.EntityFrameworkCore.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj b/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj index 757f1b3..94aac06 100644 --- a/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj +++ b/samples/BookStore/test/BookStore.HttpApi.Client.ConsoleTestApp/BookStore.HttpApi.Client.ConsoleTestApp.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj b/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj index 13dc611..6e81306 100644 --- a/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj +++ b/samples/BookStore/test/BookStore.TestBase/BookStore.TestBase.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/src/Lsw.Abp.AntDesignUI/AntDesignUiNotificationService.cs b/src/Lsw.Abp.AntDesignUI/AntDesignUiNotificationService.cs index 165baa8..6b891c5 100644 --- a/src/Lsw.Abp.AntDesignUI/AntDesignUiNotificationService.cs +++ b/src/Lsw.Abp.AntDesignUI/AntDesignUiNotificationService.cs @@ -13,7 +13,7 @@ namespace Lsw.Abp.AntDesignUI; public class AntDesignUiNotificationService: IUiNotificationService, IScopedDependency { [Inject] - public NotificationService NoticeService { get; set; } + public IMessageService MessageService { get; set; } private readonly IStringLocalizer _localizer; @@ -24,10 +24,11 @@ public class AntDesignUiNotificationService: IUiNotificationService, IScopedDepe public async Task Info(string message, string title = null, Action options = null) { + var uiNotificationOptions = CreateDefaultOptions(); options?.Invoke(uiNotificationOptions); - await Notify(title ?? _localizer["Info"], message, NotificationType.Info); + await Notify(title ?? _localizer["Info"], message, MessageType.Info); } public async Task Success(string message, string title = null, Action options = null) @@ -35,7 +36,7 @@ public class AntDesignUiNotificationService: IUiNotificationService, IScopedDepe var uiNotificationOptions = CreateDefaultOptions(); options?.Invoke(uiNotificationOptions); - await Notify(title ?? _localizer["Success"], message, NotificationType.Success); + await Notify(title ?? _localizer["Success"], message, MessageType.Success); } public async Task Warn(string message, string title = null, Action options = null) @@ -43,7 +44,7 @@ public class AntDesignUiNotificationService: IUiNotificationService, IScopedDepe var uiNotificationOptions = CreateDefaultOptions(); options?.Invoke(uiNotificationOptions); - await Notify(title ?? _localizer["Warn"], message, NotificationType.Warning); + await Notify(title ?? _localizer["Warn"], message, MessageType.Warning); } public async Task Error(string message, string title = null, Action options = null) @@ -51,17 +52,15 @@ public class AntDesignUiNotificationService: IUiNotificationService, IScopedDepe var uiNotificationOptions = CreateDefaultOptions(); options?.Invoke(uiNotificationOptions); - await Notify(title ?? _localizer["Error"], message, NotificationType.Error); + await Notify(title ?? _localizer["Error"], message, MessageType.Error); } - protected virtual async Task Notify(string title, string message, NotificationType notificationType) + protected virtual async Task Notify(string title, string message, MessageType messageType) { - await NoticeService.Open(new NotificationConfig + await MessageService.Open(new MessageConfig { - Message = title, - Description = message, - Placement = NotificationPlacement.BottomRight, - NotificationType = notificationType + Content = message, + Type = messageType }); } diff --git a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj index a7b6c61..13770a8 100644 --- a/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj +++ b/src/Lsw.Abp.AntDesignUI/Lsw.Abp.AntDesignUI.csproj @@ -9,10 +9,10 @@ - - - - + + + +