diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1b7b6e646..cbddf3269 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: "Tagged Release" on: push: - branches: [ rel-7.1.1 ] + branches: [ rel-7.2.1 ] jobs: tagged-release: @@ -14,4 +14,4 @@ jobs: with: repo_token: "${{ secrets.GITHUB_TOKEN }}" prerelease: false - automatic_release_tag: "7.1.1" + automatic_release_tag: "7.2.1" diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props index 5ecc88414..f607b9b3c 100644 --- a/aspnet-core/Directory.Build.props +++ b/aspnet-core/Directory.Build.props @@ -1,8 +1,8 @@  - 7.1.1 + 7.2.1 2.0.1 - 7.1.1 + 7.2.1 1.10.0 1.0.2 7.1.0 diff --git a/aspnet-core/common.props b/aspnet-core/common.props index 2e3e794b9..b3c1c77f3 100644 --- a/aspnet-core/common.props +++ b/aspnet-core/common.props @@ -1,7 +1,7 @@ latest - 7.1.1 + 7.2.1 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin diff --git a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj index 2822040d1..1de0cde7a 100644 --- a/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj +++ b/aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj @@ -5,7 +5,7 @@ Exe net7.0 - 7.1.1 + 7.2.1 colin Use LINGYUN.MicroService.Templates command line true diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationModule.cs index 8ce1c0709..0da3c531b 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationModule.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationModule.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Features; using Volo.Abp.Localization; using Volo.Abp.Modularity; -using Volo.Abp.Timing; +using Volo.Abp.Timing; using Volo.Abp.VirtualFileSystem; namespace LINGYUN.Abp.Features.LimitValidation @@ -15,7 +15,7 @@ namespace LINGYUN.Abp.Features.LimitValidation { public override void PreConfigureServices(ServiceConfigurationContext context) { - context.Services.OnRegistred(FeaturesLimitValidationInterceptorRegistrar.RegisterIfNeeded); + context.Services.OnRegistered(FeaturesLimitValidationInterceptorRegistrar.RegisterIfNeeded); Configure(options => { diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Idempotent/LINGYUN/Abp/Idempotent/AbpIdempotentModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.Idempotent/LINGYUN/Abp/Idempotent/AbpIdempotentModule.cs index 81ca45879..ba605f6a3 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Idempotent/LINGYUN/Abp/Idempotent/AbpIdempotentModule.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Idempotent/LINGYUN/Abp/Idempotent/AbpIdempotentModule.cs @@ -17,7 +17,7 @@ public class AbpIdempotentModule : AbpModule { public override void PreConfigureServices(ServiceConfigurationContext context) { - context.Services.OnRegistred(IdempotentInterceptorRegistrar.RegisterIfNeeded); + context.Services.OnRegistered(IdempotentInterceptorRegistrar.RegisterIfNeeded); } public override void ConfigureServices(ServiceConfigurationContext context) diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs index 01eeba4d0..d3b2e46da 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs @@ -40,7 +40,7 @@ public class AbpNotificationsCoreModule : AbpModule { var definitionProviders = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(INotificationDefinitionProvider).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN/Abp/Dapr/Actors/AspNetCore/AbpDaprActorsAspNetCoreModule.cs b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN/Abp/Dapr/Actors/AspNetCore/AbpDaprActorsAspNetCoreModule.cs index db366e498..5e67281a1 100644 --- a/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN/Abp/Dapr/Actors/AspNetCore/AbpDaprActorsAspNetCoreModule.cs +++ b/aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN/Abp/Dapr/Actors/AspNetCore/AbpDaprActorsAspNetCoreModule.cs @@ -34,7 +34,7 @@ namespace LINGYUN.Abp.Dapr.Actors.AspNetCore { var actorRegistrations = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(IActor).IsAssignableFrom(context.ImplementationType) && !actorRegistrations.Contains(context.ImplementationType)) diff --git a/aspnet-core/modules/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN/Abp/UI/Navigation/AbpUINavigationModule.cs b/aspnet-core/modules/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN/Abp/UI/Navigation/AbpUINavigationModule.cs index 1a00ad813..ae28c146c 100644 --- a/aspnet-core/modules/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN/Abp/UI/Navigation/AbpUINavigationModule.cs +++ b/aspnet-core/modules/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN/Abp/UI/Navigation/AbpUINavigationModule.cs @@ -21,7 +21,7 @@ namespace LINGYUN.Abp.UI.Navigation { var definitionProviders = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(INavigationDefinitionProvider).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/rules/LINGYUN.Abp.Rules.NRules/LINGYUN/Abp/Rules/NRules/AbpNRulesModule.cs b/aspnet-core/modules/rules/LINGYUN.Abp.Rules.NRules/LINGYUN/Abp/Rules/NRules/AbpNRulesModule.cs index 5da67aeac..5118ba6ad 100644 --- a/aspnet-core/modules/rules/LINGYUN.Abp.Rules.NRules/LINGYUN/Abp/Rules/NRules/AbpNRulesModule.cs +++ b/aspnet-core/modules/rules/LINGYUN.Abp.Rules.NRules/LINGYUN/Abp/Rules/NRules/AbpNRulesModule.cs @@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Rules.NRules { var definitionRules = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(RuleBase).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs index 4d9ddfc22..cfe41e1aa 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs @@ -27,7 +27,7 @@ public class AbpBackgroundTasksAbstractionsModule : AbpModule { var definitionProviders = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(IJobDefinitionProvider).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN/Abp/BackgroundTasks/Activities/AbpBackgroundTasksActivitiesModule.cs b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN/Abp/BackgroundTasks/Activities/AbpBackgroundTasksActivitiesModule.cs index 024923c63..e7da0a432 100644 --- a/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN/Abp/BackgroundTasks/Activities/AbpBackgroundTasksActivitiesModule.cs +++ b/aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN/Abp/BackgroundTasks/Activities/AbpBackgroundTasksActivitiesModule.cs @@ -41,7 +41,7 @@ public class AbpBackgroundTasksActivitiesModule : AbpModule { var definitionProviders = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(IJobActionDefinitionProvider).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN/Abp/Webhooks/AbpWebhooksCoreModule.cs b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN/Abp/Webhooks/AbpWebhooksCoreModule.cs index 2a39dfee7..75854f5a8 100644 --- a/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN/Abp/Webhooks/AbpWebhooksCoreModule.cs +++ b/aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN/Abp/Webhooks/AbpWebhooksCoreModule.cs @@ -18,7 +18,7 @@ public class AbpWebhooksCoreModule : AbpModule { var definitionProviders = new List(); - services.OnRegistred(context => + services.OnRegistered(context => { if (typeof(IWebhookDefinitionProvider).IsAssignableFrom(context.ImplementationType)) { diff --git a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs index 2016c54eb..740a1e644 100644 --- a/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs +++ b/aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs @@ -79,7 +79,7 @@ namespace LINGYUN.Abp.WorkflowCore private static void AutoAddDefinitionWorkflows(IServiceCollection services) { - services.OnRegistred(context => + services.OnRegistered(context => { if (context.ImplementationType.IsWorkflow()) { diff --git a/aspnet-core/templates/content/Directory.Build.props b/aspnet-core/templates/content/Directory.Build.props index 9f5155a09..7c8ba79f9 100644 --- a/aspnet-core/templates/content/Directory.Build.props +++ b/aspnet-core/templates/content/Directory.Build.props @@ -1,8 +1,8 @@ 1.6.9 - 7.1.1 - 7.1.1 + 7.2.1 + 7.2.1 7.1.0 1.10.0 1.0.2 diff --git a/aspnet-core/templates/content/common.props b/aspnet-core/templates/content/common.props index 5c1c5d235..a5a100546 100644 --- a/aspnet-core/templates/content/common.props +++ b/aspnet-core/templates/content/common.props @@ -1,7 +1,7 @@ latest - 7.1.1 + 7.2.1 colin $(NoWarn);CS1591;CS0436 https://github.com/colinin/abp-next-admin diff --git a/gateways/Directory.Build.props b/gateways/Directory.Build.props index 55e50c415..0c7591186 100644 --- a/gateways/Directory.Build.props +++ b/gateways/Directory.Build.props @@ -1,7 +1,7 @@  - 7.1.1 - 7.1.1 + 7.2.1 + 7.2.1 1.10.0 7.1.0 1.5.10 diff --git a/gateways/common.props b/gateways/common.props index bef17926c..5b7a1c8ab 100644 --- a/gateways/common.props +++ b/gateways/common.props @@ -1,7 +1,7 @@ latest - 7.1.1 + 7.2.1 colin $(NoWarn);CS1591;CS0436;CS8618;NU1803 https://github.com/colinin/abp-next-admin