diff --git a/host/common.props b/host/common.props index b8dbbd3..9bda122 100644 --- a/host/common.props +++ b/host/common.props @@ -8,6 +8,10 @@ false + + 8.1.1 + + $(NoWarn);0436 diff --git a/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj b/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj index 656c621..0474874 100644 --- a/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj +++ b/host/src/Sample.DbMigrator/Sample.DbMigrator.csproj @@ -9,10 +9,10 @@ - + - + diff --git a/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj b/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj index 58d2c73..b011f66 100644 --- a/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj +++ b/host/src/Sample.EntityFrameworkCore/Sample.EntityFrameworkCore.csproj @@ -26,8 +26,8 @@ - - + + all runtime; build; native; contentfiles; analyzers diff --git a/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj b/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj index 09f235c..14effd9 100644 --- a/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj +++ b/host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj @@ -11,10 +11,10 @@ - + - + diff --git a/modules/account/src/Passingwind.Abp.Account.AspNetCore/AccountExternalAuthController.cs b/modules/account/src/Passingwind.Abp.Account.AspNetCore/AccountExternalAuthController.cs index f6b26fc..04ed48e 100644 --- a/modules/account/src/Passingwind.Abp.Account.AspNetCore/AccountExternalAuthController.cs +++ b/modules/account/src/Passingwind.Abp.Account.AspNetCore/AccountExternalAuthController.cs @@ -154,7 +154,7 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext() UserName = user.Name }); - return RedirectSafely(returnUrl, returnUrlHash); + return await RedirectSafelyAsync(returnUrl, returnUrlHash); } protected virtual async Task ExternalLoginSignInAsync(ExternalLoginInfo loginInfo) diff --git a/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountExternalController.cs b/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountExternalController.cs index a3fc16e..4ea7adc 100644 --- a/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountExternalController.cs +++ b/modules/account/src/Passingwind.Abp.Account.HttpApi/AccountExternalController.cs @@ -2,6 +2,7 @@ using JetBrains.Annotations; using Microsoft.AspNetCore.Mvc; using Volo.Abp; +using Asp.Versioning; using Volo.Abp.AspNetCore.Mvc; namespace Passingwind.Abp.Account; diff --git a/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj b/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj index 56f8412..a198ddd 100644 --- a/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj +++ b/modules/account/src/Passingwind.Abp.Account.Installer/Passingwind.Abp.Account.Installer.csproj @@ -21,4 +21,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj index bf21c88..1e7b6e9 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.AspNetCore/Passingwind.Abp.ApiKey.AspNetCore.csproj @@ -16,7 +16,7 @@ - + diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/ApiKeyRecordController.cs b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/ApiKeyRecordController.cs index 9f6392c..10a6cdd 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/ApiKeyRecordController.cs +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.HttpApi/ApiKeyRecordController.cs @@ -1,5 +1,6 @@ using System; using System.Threading.Tasks; +using Asp.Versioning; using Microsoft.AspNetCore.Mvc; using Volo.Abp; using Volo.Abp.Application.Dtos; diff --git a/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj b/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj index 637a6ce..93a8ee2 100644 --- a/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj +++ b/modules/api-keys/src/Passingwind.Abp.ApiKey.Installer/Passingwind.Abp.ApiKey.Installer.csproj @@ -10,7 +10,7 @@ - + @@ -21,4 +21,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/common.props b/modules/common.props index 0fe054a..8812caa 100644 --- a/modules/common.props +++ b/modules/common.props @@ -22,7 +22,8 @@ - 8.0.0 + 8.1.1 + 4.11.0 @@ -45,15 +46,15 @@ - + all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers - + all runtime; build; native; contentfiles; analyzers diff --git a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.AuthServer/Passingwind.Abp.DictionaryManagement.AuthServer.csproj b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.AuthServer/Passingwind.Abp.DictionaryManagement.AuthServer.csproj index 1ad244e..ef8e4b3 100644 --- a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.AuthServer/Passingwind.Abp.DictionaryManagement.AuthServer.csproj +++ b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.AuthServer/Passingwind.Abp.DictionaryManagement.AuthServer.csproj @@ -1,9 +1,9 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement true @@ -11,42 +11,42 @@ - + - - + + all runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,4 +67,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.Host.Shared/Passingwind.Abp.DictionaryManagement.Host.Shared.csproj b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.Host.Shared/Passingwind.Abp.DictionaryManagement.Host.Shared.csproj index ac7c168..e2b3bdb 100644 --- a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.Host.Shared/Passingwind.Abp.DictionaryManagement.Host.Shared.csproj +++ b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.Host.Shared/Passingwind.Abp.DictionaryManagement.Host.Shared.csproj @@ -8,4 +8,19 @@ Passingwind.Abp.DictionaryManagement + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.HttpApi.Host/Passingwind.Abp.DictionaryManagement.HttpApi.Host.csproj b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.HttpApi.Host/Passingwind.Abp.DictionaryManagement.HttpApi.Host.csproj index 9ac6e7c..4f9d8ba 100644 --- a/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.HttpApi.Host/Passingwind.Abp.DictionaryManagement.HttpApi.Host.csproj +++ b/modules/dictionary-management/host/Passingwind.Abp.DictionaryManagement.HttpApi.Host/Passingwind.Abp.DictionaryManagement.HttpApi.Host.csproj @@ -1,9 +1,9 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement true @@ -11,22 +11,25 @@ - + - - - - - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + @@ -43,4 +46,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj index 56caa47..cbee9e6 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Application/Passingwind.Abp.DictionaryManagement.Application.csproj @@ -14,5 +14,7 @@ + + diff --git a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Installer/Passingwind.Abp.DictionaryManagement.Installer.csproj b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Installer/Passingwind.Abp.DictionaryManagement.Installer.csproj index bd0ef00..6a75105 100644 --- a/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Installer/Passingwind.Abp.DictionaryManagement.Installer.csproj +++ b/modules/dictionary-management/src/Passingwind.Abp.DictionaryManagement.Installer/Passingwind.Abp.DictionaryManagement.Installer.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable true Passingwind.Abp.DictionaryManagement @@ -21,4 +21,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj index 43270ea..5e883a5 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Application.Tests/Passingwind.Abp.DictionaryManagement.Application.Tests.csproj @@ -1,9 +1,9 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement @@ -11,7 +11,22 @@ - + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj index 78ef1ae..6b9b84b 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.Domain.Tests/Passingwind.Abp.DictionaryManagement.Domain.Tests.csproj @@ -1,16 +1,31 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement - + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj index ba1d1e3..2f704ad 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DictionaryManagement.EntityFrameworkCore.Tests.csproj @@ -1,19 +1,34 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement - - + + - + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp.csproj index f12879b..5af6be5 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DictionaryManagement.HttpApi.Client.ConsoleTestApp.csproj @@ -2,14 +2,14 @@ Exe - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement - - + + @@ -27,7 +27,7 @@ - + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj index dbdcc85..ee3d831 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.MongoDB.Tests/Passingwind.Abp.DictionaryManagement.MongoDB.Tests.csproj @@ -1,18 +1,33 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement - + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj index 78a3324..da39157 100644 --- a/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj +++ b/modules/dictionary-management/test/Passingwind.Abp.DictionaryManagement.TestBase/Passingwind.Abp.DictionaryManagement.TestBase.csproj @@ -1,28 +1,46 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DictionaryManagement - - - + + + all runtime; build; native; contentfiles; analyzers - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/Passingwind.Abp.DynamicPermissionManagement.AuthServer.csproj b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/Passingwind.Abp.DynamicPermissionManagement.AuthServer.csproj index 736773b..85612ee 100644 --- a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/Passingwind.Abp.DynamicPermissionManagement.AuthServer.csproj +++ b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/Passingwind.Abp.DynamicPermissionManagement.AuthServer.csproj @@ -1,9 +1,9 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement true @@ -11,42 +11,42 @@ - + - - + + all runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,4 +67,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/package.json b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/package.json index efdf28d..0c61ebe 100644 --- a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/package.json +++ b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.2.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~$(AbpVersion)" } } diff --git a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/yarn.lock b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/yarn.lock index 71563f1..2e35c79 100644 --- a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/yarn.lock +++ b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.AuthServer/yarn.lock @@ -2,38 +2,38 @@ # yarn lockfile v1 -"@abp/aspnetcore.mvc.ui.theme.basic@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-7.2.3.tgz#31f2dda74b2bf8f520caf97690e509fd1c1088c4" +"@abp/aspnetcore.mvc.ui.theme.basic@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.basic/-/aspnetcore.mvc.ui.theme.basic-$(AbpVersion).tgz#31f2dda74b2bf8f520caf97690e509fd1c1088c4" integrity sha512-7DIwWrkLJSc2kXYcIcZH+EivpwOXzkO4j2yrUilK0OijoOM9Pa/iGStdNTPlYioOKUNti3/1zah+v5SELNdqIw== dependencies: - "@abp/aspnetcore.mvc.ui.theme.shared" "~7.2.3" + "@abp/aspnetcore.mvc.ui.theme.shared" "~$(AbpVersion)" -"@abp/aspnetcore.mvc.ui.theme.shared@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-7.2.3.tgz#189dde88792497d29f76a6079dc6db34973ee98d" +"@abp/aspnetcore.mvc.ui.theme.shared@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui.theme.shared/-/aspnetcore.mvc.ui.theme.shared-$(AbpVersion).tgz#189dde88792497d29f76a6079dc6db34973ee98d" integrity sha512-+G2mM/BJWqgGqZFg6GP28PaCtq+YlRmRfg7r0JQ1wkAN9pc11yKm0LRQjFnkcVBzg0A+N2hZqnFbW7wQhwXOHg== dependencies: - "@abp/aspnetcore.mvc.ui" "~7.2.3" - "@abp/bootstrap" "~7.2.3" - "@abp/bootstrap-datepicker" "~7.2.3" - "@abp/bootstrap-daterangepicker" "~7.2.3" - "@abp/datatables.net-bs5" "~7.2.3" - "@abp/font-awesome" "~7.2.3" - "@abp/jquery-form" "~7.2.3" - "@abp/jquery-validation-unobtrusive" "~7.2.3" - "@abp/lodash" "~7.2.3" - "@abp/luxon" "~7.2.3" - "@abp/malihu-custom-scrollbar-plugin" "~7.2.3" - "@abp/moment" "~7.2.3" - "@abp/select2" "~7.2.3" - "@abp/sweetalert2" "~7.2.3" - "@abp/timeago" "~7.2.3" - "@abp/toastr" "~7.2.3" - -"@abp/aspnetcore.mvc.ui@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-7.2.3.tgz#d828561e678f6ea779a67c908705ba553ae82edc" + "@abp/aspnetcore.mvc.ui" "~$(AbpVersion)" + "@abp/bootstrap" "~$(AbpVersion)" + "@abp/bootstrap-datepicker" "~$(AbpVersion)" + "@abp/bootstrap-daterangepicker" "~$(AbpVersion)" + "@abp/datatables.net-bs5" "~$(AbpVersion)" + "@abp/font-awesome" "~$(AbpVersion)" + "@abp/jquery-form" "~$(AbpVersion)" + "@abp/jquery-validation-unobtrusive" "~$(AbpVersion)" + "@abp/lodash" "~$(AbpVersion)" + "@abp/luxon" "~$(AbpVersion)" + "@abp/malihu-custom-scrollbar-plugin" "~$(AbpVersion)" + "@abp/moment" "~$(AbpVersion)" + "@abp/select2" "~$(AbpVersion)" + "@abp/sweetalert2" "~$(AbpVersion)" + "@abp/timeago" "~$(AbpVersion)" + "@abp/toastr" "~$(AbpVersion)" + +"@abp/aspnetcore.mvc.ui@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/aspnetcore.mvc.ui/-/aspnetcore.mvc.ui-$(AbpVersion).tgz#d828561e678f6ea779a67c908705ba553ae82edc" integrity sha512-KJCw6OxjQBgNw4QoSoDQOe32bFF9NvHdD09zMVsoCB/GgN66dcbZnk+ldidHcwjLFDPXOuHJMx+TKmno3VgUaQ== dependencies: ansi-colors "^4.1.1" @@ -43,157 +43,157 @@ merge-stream "^2.0.0" micromatch "^4.0.2" -"@abp/bootstrap-datepicker@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-7.2.3.tgz#7610ff44a6c1ea73f0c9b4c79a31cbb9e505d66f" +"@abp/bootstrap-datepicker@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/bootstrap-datepicker/-/bootstrap-datepicker-$(AbpVersion).tgz#7610ff44a6c1ea73f0c9b4c79a31cbb9e505d66f" integrity sha512-wiKVXftVrXcjwz0FpshD6P4WW3CNk/4cLH15aaqRjM+J0BigDeH9CczlpVc7jXdn+c8plHIRz0t5tqlUud7dIQ== dependencies: bootstrap-datepicker "^1.9.0" -"@abp/bootstrap-daterangepicker@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-7.2.3.tgz#3946fb853dae52ef092db4bb23b94389577c17d3" +"@abp/bootstrap-daterangepicker@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/bootstrap-daterangepicker/-/bootstrap-daterangepicker-$(AbpVersion).tgz#3946fb853dae52ef092db4bb23b94389577c17d3" integrity sha512-ChdnXMzHvg+HwrUtw2z6KuqRTqHVOq8qEBai+IPW6PykJSML+tZKzer3jzDIzyHq68OIqom3n3xL0XpcniKMew== dependencies: bootstrap-daterangepicker "^3.1.0" -"@abp/bootstrap@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-7.2.3.tgz#43ecd5912ac65bbc142f198ec112b0b2a15e4864" +"@abp/bootstrap@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/bootstrap/-/bootstrap-$(AbpVersion).tgz#43ecd5912ac65bbc142f198ec112b0b2a15e4864" integrity sha512-Z00q1sAwo9PvFSpfFlbbUHPMyghLOzuEuAzz/8nA6tK7WR0KQBS/0zGC0nK9hNwbyZ4FqKwPSznRVwuwrnqyhQ== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" bootstrap "^5.1.3" -"@abp/core@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/core/-/core-7.2.3.tgz#a669073989a30f600355b368c01c654714456f17" +"@abp/core@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/core/-/core-$(AbpVersion).tgz#a669073989a30f600355b368c01c654714456f17" integrity sha512-UyKBWwXbKCzKZwV2YJPgP3v2naDFsfJzV+KEHpdgLdPZyrpBhp+bQ80VNVe2HHrD/bLfhM4fu9pCXw6RYZKnvA== dependencies: - "@abp/utils" "~7.2.3" + "@abp/utils" "~$(AbpVersion)" -"@abp/datatables.net-bs5@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-7.2.3.tgz#362f3b8ff2f3612989787e2b6ef19bad181b4206" +"@abp/datatables.net-bs5@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/datatables.net-bs5/-/datatables.net-bs5-$(AbpVersion).tgz#362f3b8ff2f3612989787e2b6ef19bad181b4206" integrity sha512-TmXTkIX+Vb1O/fER5JeRlWIOZLoSXG4QD3F0ZbebrjgS9k7oSu9igR/VhXBs1m1lvOqcNKv7Y4LTNRAMw+Mi0A== dependencies: - "@abp/datatables.net" "~7.2.3" + "@abp/datatables.net" "~$(AbpVersion)" datatables.net-bs5 "^1.11.4" -"@abp/datatables.net@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-7.2.3.tgz#36661e223d15a0f75caad607094007d974ba678b" +"@abp/datatables.net@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/datatables.net/-/datatables.net-$(AbpVersion).tgz#36661e223d15a0f75caad607094007d974ba678b" integrity sha512-g+LmRMg4Sk34iU/MN4RpgC/yd8NVEjhVWg/kT+nuWunsnwLHkcfK59KPGXn9ZLktL4VqQYj2WeXbDv8TEbOObg== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~$(AbpVersion)" datatables.net "^1.11.4" -"@abp/font-awesome@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-7.2.3.tgz#09b7c02b16ff99c9b5b62c1eefad9b1fc2879bcd" +"@abp/font-awesome@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/font-awesome/-/font-awesome-$(AbpVersion).tgz#09b7c02b16ff99c9b5b62c1eefad9b1fc2879bcd" integrity sha512-+4QRhfU08t1MYkmzTPX0B+p+SZQtOqtlDafzeDm5X6fbOlxV1hi97eRWtLtLgLjodjJWztpECWcsTUTgDhExwQ== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" "@fortawesome/fontawesome-free" "^5.15.4" -"@abp/jquery-form@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-7.2.3.tgz#b0b295b22ae2ba292100e64d0bb97b3e1e295307" +"@abp/jquery-form@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/jquery-form/-/jquery-form-$(AbpVersion).tgz#b0b295b22ae2ba292100e64d0bb97b3e1e295307" integrity sha512-ucdGIZ0sxefakGRei9BJvDuoN16fKsYfpOT70/udw3k7uC3gFJD0AvAlEOEZPsFZhpNoqUKexNMym4lZovqBkg== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~$(AbpVersion)" jquery-form "^4.3.0" -"@abp/jquery-validation-unobtrusive@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-7.2.3.tgz#1df04e286baa521c216cb949468199e6cacc34e3" +"@abp/jquery-validation-unobtrusive@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/jquery-validation-unobtrusive/-/jquery-validation-unobtrusive-$(AbpVersion).tgz#1df04e286baa521c216cb949468199e6cacc34e3" integrity sha512-Hcf1sqAFRIAYKqvN1pZGed+lazzY1nztvcmQlOOgUquiXRS3QjI3dIvxWw5nekJwUPqMpSfuC1GErQo0KpE1fw== dependencies: - "@abp/jquery-validation" "~7.2.3" + "@abp/jquery-validation" "~$(AbpVersion)" jquery-validation-unobtrusive "^3.2.12" -"@abp/jquery-validation@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-7.2.3.tgz#438ac052e5d71dab50cf5da8be60ea68a460a725" +"@abp/jquery-validation@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/jquery-validation/-/jquery-validation-$(AbpVersion).tgz#438ac052e5d71dab50cf5da8be60ea68a460a725" integrity sha512-drpE5mXErHQPk/4KChsj3zwNCA4GqNlYquTtHNv9/t5S/NuGqFAkchPV6mRYaiQypcxCndZQNSUEqnWxbuMY0g== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~$(AbpVersion)" jquery-validation "^1.19.3" -"@abp/jquery@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/jquery/-/jquery-7.2.3.tgz#555192ff0bcde89bbabee0f734ff74bf77cce1b5" +"@abp/jquery@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/jquery/-/jquery-$(AbpVersion).tgz#555192ff0bcde89bbabee0f734ff74bf77cce1b5" integrity sha512-r/p3D2QlV57YvrGJsLfTuIJGwLSSi5AVFtkmgKyfpyXYOCNb+TVF9sEZOZnoZebX6cT0JRvtUfZ0dk6ZBebAzg== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" jquery "~3.6.0" -"@abp/lodash@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/lodash/-/lodash-7.2.3.tgz#99c1667f1499a7f318902e96ff81b4184b0dce86" +"@abp/lodash@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/lodash/-/lodash-$(AbpVersion).tgz#99c1667f1499a7f318902e96ff81b4184b0dce86" integrity sha512-5KuXPPpa2mkTlUYPR83bUTJUSSGoq9/kFSf9fYC0Wk2mFFeG4mRK6mXwcyHTfYshQe2qxuncxZsJ+4j5uQN9PA== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" lodash "^4.17.21" -"@abp/luxon@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/luxon/-/luxon-7.2.3.tgz#f643ed28b2d1743edd41edfec98d0e70b2f1f008" +"@abp/luxon@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/luxon/-/luxon-$(AbpVersion).tgz#f643ed28b2d1743edd41edfec98d0e70b2f1f008" integrity sha512-Y3IT1GbyuNSAzfpGnc5uzjz3Z/nDRUpYiZhoX0XeoQlJ+GyVT/+dytsZbuQBLgEWmQJhk9zxdcITXFT5vrWDcw== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" luxon "^2.3.0" -"@abp/malihu-custom-scrollbar-plugin@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-7.2.3.tgz#a29f25921b07683b02e2f5c82a3da827e3e7d552" +"@abp/malihu-custom-scrollbar-plugin@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/malihu-custom-scrollbar-plugin/-/malihu-custom-scrollbar-plugin-$(AbpVersion).tgz#a29f25921b07683b02e2f5c82a3da827e3e7d552" integrity sha512-wq9eBrw/bY3wb50v5zuL0qOcVLOT86XN2ZJQj69O/bi2+0WNdLRCqMHhY0kaafb7UIBAlKChKA/xeICwCZxn+w== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" malihu-custom-scrollbar-plugin "^3.1.5" -"@abp/moment@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/moment/-/moment-7.2.3.tgz#f6d2ba7b030b81239853490bdcc9e3c2bd4a39b1" +"@abp/moment@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/moment/-/moment-$(AbpVersion).tgz#f6d2ba7b030b81239853490bdcc9e3c2bd4a39b1" integrity sha512-pXsOzSom9RZHRGWuVaLIVzSkPayIcWMMmgSyo8T3gtZzZG/QJbpBWT+pug0X8pmV8So4d9E0LjacmODBKLM30A== dependencies: moment "^2.9.0" -"@abp/select2@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/select2/-/select2-7.2.3.tgz#4cecd1cd843807583fce09ef632f472f3f7da70b" +"@abp/select2@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/select2/-/select2-$(AbpVersion).tgz#4cecd1cd843807583fce09ef632f472f3f7da70b" integrity sha512-Cdzl467UftB421W+l8uikGr2NlOsHwxKDxt5yPrF03LEec1MBys5y7UPUV1TEO6l0xwAVi4mW8dXaawyIOSjUA== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" select2 "^4.0.13" -"@abp/sweetalert2@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-7.2.3.tgz#9e9c503bdb4d47d2b67b0d8193d82145884c90f3" +"@abp/sweetalert2@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/sweetalert2/-/sweetalert2-$(AbpVersion).tgz#9e9c503bdb4d47d2b67b0d8193d82145884c90f3" integrity sha512-KHZD1YRMN6Z4JxPfXuEwocubooux8nKq6sPNG6RKg+rWpp23Fp8nX/ZngJNywVXSRqzrdEvUAM+92JG7zMwKXw== dependencies: - "@abp/core" "~7.2.3" + "@abp/core" "~$(AbpVersion)" sweetalert2 "^11.3.6" -"@abp/timeago@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/timeago/-/timeago-7.2.3.tgz#2ced6fa607a0471bf3385fbf5d9b1f2d902e824a" +"@abp/timeago@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/timeago/-/timeago-$(AbpVersion).tgz#2ced6fa607a0471bf3385fbf5d9b1f2d902e824a" integrity sha512-7eiibNXJWBGpQnitd/i8aWUNHOkcsuq8fAwBLJWvG8Whhh1nmBEjng0pGhheMqo0xoydefWi1K2uZDg99tKPeQ== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~$(AbpVersion)" timeago "^1.6.7" -"@abp/toastr@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/toastr/-/toastr-7.2.3.tgz#0ef7c24b232ca3d01d4ac5a7dff57800b0ebdcbf" +"@abp/toastr@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/toastr/-/toastr-$(AbpVersion).tgz#0ef7c24b232ca3d01d4ac5a7dff57800b0ebdcbf" integrity sha512-2zNMQE6ArRULP6xl+M66/EY83ZrXfNY+sNHUkmZH4uqfGhqR/ijKIQm1quxCLDmUcAjRr1kzu8BCc98pc9tfFw== dependencies: - "@abp/jquery" "~7.2.3" + "@abp/jquery" "~$(AbpVersion)" toastr "^2.1.4" -"@abp/utils@~7.2.3": - version "7.2.3" - resolved "https://registry.npmmirror.com/@abp/utils/-/utils-7.2.3.tgz#f384ba76b2948dbc8c49a453a343facda0825e2c" +"@abp/utils@~$(AbpVersion)": + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/@abp/utils/-/utils-$(AbpVersion).tgz#f384ba76b2948dbc8c49a453a343facda0825e2c" integrity sha512-hejxDJhSI9Kor4mS9c/JHHQrW/wLXC/XMOJMUcBVkX/5IQd9GU9EW63oalNQyVA3gz3h5obnb0Qcfdv65wc5Pg== dependencies: just-compare "^1.3.0" @@ -1031,8 +1031,8 @@ glob-watcher@^5.0.3: object.defaults "^1.1.0" glob@^7.1.1, glob@^7.1.6: - version "7.2.3" - resolved "https://registry.npmmirror.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" + version "$(AbpVersion)" + resolved "https://registry.npmmirror.com/glob/-/glob-$(AbpVersion).tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== dependencies: fs.realpath "^1.0.0" diff --git a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.Host.Shared/Passingwind.Abp.DynamicPermissionManagement.Host.Shared.csproj b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.Host.Shared/Passingwind.Abp.DynamicPermissionManagement.Host.Shared.csproj index 8f3e5c2..c228d09 100644 --- a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.Host.Shared/Passingwind.Abp.DynamicPermissionManagement.Host.Shared.csproj +++ b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.Host.Shared/Passingwind.Abp.DynamicPermissionManagement.Host.Shared.csproj @@ -8,4 +8,19 @@ Passingwind.Abp.DynamicPermissionManagement + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host.csproj b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host.csproj index 2e39bc7..78493a9 100644 --- a/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host.csproj +++ b/modules/dynamic-permission-management/host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement true @@ -11,22 +11,25 @@ - + - - - - - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + @@ -43,4 +46,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Domain/Passingwind.Abp.DynamicPermissionManagement.Domain.csproj b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Domain/Passingwind.Abp.DynamicPermissionManagement.Domain.csproj index 60f08a8..5849e1a 100644 --- a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Domain/Passingwind.Abp.DynamicPermissionManagement.Domain.csproj +++ b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Domain/Passingwind.Abp.DynamicPermissionManagement.Domain.csproj @@ -14,4 +14,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj index 63e9a03..f6cffe9 100644 --- a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj +++ b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.csproj @@ -14,4 +14,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Installer/Passingwind.Abp.DynamicPermissionManagement.Installer.csproj b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Installer/Passingwind.Abp.DynamicPermissionManagement.Installer.csproj index 06d53f4..d8846cf 100644 --- a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Installer/Passingwind.Abp.DynamicPermissionManagement.Installer.csproj +++ b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.Installer/Passingwind.Abp.DynamicPermissionManagement.Installer.csproj @@ -3,14 +3,14 @@ - net7.0 + net8.0 enable true Passingwind.Abp.DynamicPermissionManagement - + @@ -21,4 +21,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.MongoDB/Passingwind.Abp.DynamicPermissionManagement.MongoDB.csproj b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.MongoDB/Passingwind.Abp.DynamicPermissionManagement.MongoDB.csproj index 19099f4..2dfdadc 100644 --- a/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.MongoDB/Passingwind.Abp.DynamicPermissionManagement.MongoDB.csproj +++ b/modules/dynamic-permission-management/src/Passingwind.Abp.DynamicPermissionManagement.MongoDB/Passingwind.Abp.DynamicPermissionManagement.MongoDB.csproj @@ -14,4 +14,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Application.Tests/Passingwind.Abp.DynamicPermissionManagement.Application.Tests.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Application.Tests/Passingwind.Abp.DynamicPermissionManagement.Application.Tests.csproj index f6e1055..9bdd9d4 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Application.Tests/Passingwind.Abp.DynamicPermissionManagement.Application.Tests.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Application.Tests/Passingwind.Abp.DynamicPermissionManagement.Application.Tests.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement @@ -11,7 +11,22 @@ - + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests.csproj index 68c2856..48ff31b 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests/Passingwind.Abp.DynamicPermissionManagement.Domain.Tests.csproj @@ -3,14 +3,29 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement - + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests.csproj index b8a031a..59820e4 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests/Passingwind.Abp.DynamicPermissionManagement.EntityFrameworkCore.Tests.csproj @@ -3,17 +3,32 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement - - + + - + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp.csproj index 1159106..09ce873 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp/Passingwind.Abp.DynamicPermissionManagement.HttpApi.Client.ConsoleTestApp.csproj @@ -2,14 +2,14 @@ Exe - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement - - + + @@ -27,7 +27,7 @@ - + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests.csproj index 0848898..87622e4 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests/Passingwind.Abp.DynamicPermissionManagement.MongoDB.Tests.csproj @@ -3,16 +3,31 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement - + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.TestBase/Passingwind.Abp.DynamicPermissionManagement.TestBase.csproj b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.TestBase/Passingwind.Abp.DynamicPermissionManagement.TestBase.csproj index 6dce25f..1701011 100644 --- a/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.TestBase/Passingwind.Abp.DynamicPermissionManagement.TestBase.csproj +++ b/modules/dynamic-permission-management/test/Passingwind.Abp.DynamicPermissionManagement.TestBase/Passingwind.Abp.DynamicPermissionManagement.TestBase.csproj @@ -3,26 +3,44 @@ - net7.0 + net8.0 enable Passingwind.Abp.DynamicPermissionManagement - - - + + + all runtime; build; native; contentfiles; analyzers - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/file-management/src/Passingwind.Abp.FileManagement.Application.Contracts/Passingwind.Abp.FileManagement.Application.Contracts.csproj b/modules/file-management/src/Passingwind.Abp.FileManagement.Application.Contracts/Passingwind.Abp.FileManagement.Application.Contracts.csproj index 09f8a66..bc0b042 100644 --- a/modules/file-management/src/Passingwind.Abp.FileManagement.Application.Contracts/Passingwind.Abp.FileManagement.Application.Contracts.csproj +++ b/modules/file-management/src/Passingwind.Abp.FileManagement.Application.Contracts/Passingwind.Abp.FileManagement.Application.Contracts.csproj @@ -14,4 +14,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj index 4650429..1570c34 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.AspNetCore/Passingwind.Abp.IdentityClient.AspNetCore.csproj @@ -13,9 +13,9 @@ - + - + diff --git a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj index e4903e5..a12189d 100644 --- a/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj +++ b/modules/identity-client/src/Passingwind.Abp.IdentityClient.Domain/Passingwind.Abp.IdentityClient.Domain.csproj @@ -15,4 +15,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/identity/host/Passingwind.Abp.Identity.AuthServer/Passingwind.Abp.Identity.AuthServer.csproj b/modules/identity/host/Passingwind.Abp.Identity.AuthServer/Passingwind.Abp.Identity.AuthServer.csproj index 14c1dee..d335e25 100644 --- a/modules/identity/host/Passingwind.Abp.Identity.AuthServer/Passingwind.Abp.Identity.AuthServer.csproj +++ b/modules/identity/host/Passingwind.Abp.Identity.AuthServer/Passingwind.Abp.Identity.AuthServer.csproj @@ -1,9 +1,9 @@ - + - net7.0 + net8.0 enable Passingwind.Abp.Identity true @@ -11,42 +11,42 @@ - + - - + + all runtime; build; native; contentfiles; analyzers - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -67,4 +67,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/identity/host/Passingwind.Abp.Identity.AuthServer/package.json b/modules/identity/host/Passingwind.Abp.Identity.AuthServer/package.json index efdf28d..0c61ebe 100644 --- a/modules/identity/host/Passingwind.Abp.Identity.AuthServer/package.json +++ b/modules/identity/host/Passingwind.Abp.Identity.AuthServer/package.json @@ -3,6 +3,6 @@ "name": "my-app-authserver", "private": true, "dependencies": { - "@abp/aspnetcore.mvc.ui.theme.basic": "~7.2.3" + "@abp/aspnetcore.mvc.ui.theme.basic": "~$(AbpVersion)" } } diff --git a/modules/identity/host/Passingwind.Abp.Identity.Host.Shared/Passingwind.Abp.Identity.Host.Shared.csproj b/modules/identity/host/Passingwind.Abp.Identity.Host.Shared/Passingwind.Abp.Identity.Host.Shared.csproj index ee36d19..6be6682 100644 --- a/modules/identity/host/Passingwind.Abp.Identity.Host.Shared/Passingwind.Abp.Identity.Host.Shared.csproj +++ b/modules/identity/host/Passingwind.Abp.Identity.Host.Shared/Passingwind.Abp.Identity.Host.Shared.csproj @@ -8,4 +8,19 @@ Passingwind.Abp.Identity + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/identity/host/Passingwind.Abp.Identity.HttpApi.Host/Passingwind.Abp.Identity.HttpApi.Host.csproj b/modules/identity/host/Passingwind.Abp.Identity.HttpApi.Host/Passingwind.Abp.Identity.HttpApi.Host.csproj index ae55459..546ee17 100644 --- a/modules/identity/host/Passingwind.Abp.Identity.HttpApi.Host/Passingwind.Abp.Identity.HttpApi.Host.csproj +++ b/modules/identity/host/Passingwind.Abp.Identity.HttpApi.Host/Passingwind.Abp.Identity.HttpApi.Host.csproj @@ -3,7 +3,7 @@ - net7.0 + net8.0 enable Passingwind.Abp.Identity true @@ -11,22 +11,25 @@ - + - - - - - - - - - - - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + @@ -42,4 +45,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + diff --git a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs index 07d6112..06318b7 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.Application/IdentityUserV2AppService.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.Options; using Volo.Abp.Application.Dtos; using Volo.Abp.Application.Services; +using Volo.Abp.Authorization.Permissions; using Volo.Abp.Data; using Volo.Abp.Domain.Entities; using Volo.Abp.Identity; @@ -30,7 +31,7 @@ public IdentityUserV2AppService( IOptions identityOptions, IIdentityClaimTypeRepository identityClaimTypeRepository, IOrganizationUnitRepository organizationUnitRepository, - IdentityUserManagerV2 userManagerV2) : base(userManager, userRepository, roleRepository, identityOptions) + IdentityUserManagerV2 userManagerV2, IPermissionChecker permissionChecker) : base(userManager, userRepository, roleRepository, identityOptions, permissionChecker) { IdentityClaimTypeRepository = identityClaimTypeRepository; OrganizationUnitRepository = organizationUnitRepository; diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityRoleV2Controller.cs b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityRoleV2Controller.cs index d09c79c..3cc136e 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityRoleV2Controller.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityRoleV2Controller.cs @@ -4,7 +4,7 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Identity; - +using Asp.Versioning; namespace Passingwind.Abp.Identity; [ControllerName("IdentityRole")] diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserLookupController.cs b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserLookupController.cs index 685210d..7ff6aea 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserLookupController.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserLookupController.cs @@ -6,7 +6,7 @@ using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.Identity; using Volo.Abp.Users; - +using Asp.Versioning; namespace Passingwind.Abp.Identity; [RemoteService(Name = IdentityRemoteServiceConsts.RemoteServiceName)] diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserV2Controller.cs b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserV2Controller.cs index 435a78b..38ded1d 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserV2Controller.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/IdentityUserV2Controller.cs @@ -4,7 +4,7 @@ using Volo.Abp; using Volo.Abp.Application.Dtos; using Volo.Abp.Identity; - +using Asp.Versioning; namespace Passingwind.Abp.Identity; [ControllerName("IdentityUser")] diff --git a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Integration/IdentityUserIntegrationController.cs b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Integration/IdentityUserIntegrationController.cs index 83a7e72..3cb71cf 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Integration/IdentityUserIntegrationController.cs +++ b/modules/identity/src/Passingwind.Abp.Identity.HttpApi/Integration/IdentityUserIntegrationController.cs @@ -7,7 +7,7 @@ using Volo.Abp.Identity; using Volo.Abp.Identity.Integration; using Volo.Abp.Users; - +using Asp.Versioning; namespace Passingwind.Abp.Identity.Integration; [RemoteService(Name = IdentityRemoteServiceConsts.RemoteServiceName)] diff --git a/modules/identity/src/Passingwind.Abp.Identity.Installer/Passingwind.Abp.Identity.Installer.csproj b/modules/identity/src/Passingwind.Abp.Identity.Installer/Passingwind.Abp.Identity.Installer.csproj index bea02fa..cc8120d 100644 --- a/modules/identity/src/Passingwind.Abp.Identity.Installer/Passingwind.Abp.Identity.Installer.csproj +++ b/modules/identity/src/Passingwind.Abp.Identity.Installer/Passingwind.Abp.Identity.Installer.csproj @@ -3,14 +3,14 @@ - net7.0 + net8.0 enable true Passingwind.Abp.Identity - + @@ -21,4 +21,19 @@ + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + + all + runtime; build; native; contentfiles; analyzers + + +