Browse Source
Merge pull request #828 from colinin/upt-7.2.1
upgrade abp framework to 7.2.1
pull/830/head
yx lin
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with
23 additions and
23 deletions
-
.github/workflows/release.yml
-
aspnet-core/Directory.Build.props
-
aspnet-core/common.props
-
aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
-
aspnet-core/modules/common/LINGYUN.Abp.Features.LimitValidation/LINGYUN/Abp/Features/LimitValidation/AbpFeaturesLimitValidationModule.cs
-
aspnet-core/modules/common/LINGYUN.Abp.Idempotent/LINGYUN/Abp/Idempotent/AbpIdempotentModule.cs
-
aspnet-core/modules/common/LINGYUN.Abp.Notifications.Core/LINGYUN/Abp/Notifications/AbpNotificationsCoreModule.cs
-
aspnet-core/modules/dapr/LINGYUN.Abp.Dapr.Actors.AspNetCore/LINGYUN/Abp/Dapr/Actors/AspNetCore/AbpDaprActorsAspNetCoreModule.cs
-
aspnet-core/modules/navigation/LINGYUN.Abp.UI.Navigation/LINGYUN/Abp/UI/Navigation/AbpUINavigationModule.cs
-
aspnet-core/modules/rules/LINGYUN.Abp.Rules.NRules/LINGYUN/Abp/Rules/NRules/AbpNRulesModule.cs
-
aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Abstractions/LINGYUN/Abp/BackgroundTasks/AbpBackgroundTasksAbstractionsModule.cs
-
aspnet-core/modules/task-management/LINGYUN.Abp.BackgroundTasks.Activities/LINGYUN/Abp/BackgroundTasks/Activities/AbpBackgroundTasksActivitiesModule.cs
-
aspnet-core/modules/webhooks/LINGYUN.Abp.Webhooks.Core/LINGYUN/Abp/Webhooks/AbpWebhooksCoreModule.cs
-
aspnet-core/modules/workflow/LINGYUN.Abp.WorkflowCore/LINGYUN/Abp/WorkflowCore/AbpWorkflowCoreModule.cs
-
aspnet-core/templates/content/Directory.Build.props
-
aspnet-core/templates/content/common.props
-
gateways/Directory.Build.props
-
gateways/common.props
|
|
|
@ -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" |
|
|
|
|
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<VoloAbpPackageVersion>7.1.1</VoloAbpPackageVersion> |
|
|
|
<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion> |
|
|
|
<VoloAbpLeptonXThemePackageVersion>2.0.1</VoloAbpLeptonXThemePackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.1.1</LINGYUNAbpPackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion> |
|
|
|
<DaprPackageVersion>1.10.0</DaprPackageVersion> |
|
|
|
<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion> |
|
|
|
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<LangVersion>latest</LangVersion> |
|
|
|
<Version>7.1.1</Version> |
|
|
|
<Version>7.2.1</Version> |
|
|
|
<Authors>colin</Authors> |
|
|
|
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn> |
|
|
|
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl> |
|
|
|
|
|
|
|
@ -5,7 +5,7 @@ |
|
|
|
<PropertyGroup> |
|
|
|
<OutputType>Exe</OutputType> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<Version>7.1.1</Version> |
|
|
|
<Version>7.2.1</Version> |
|
|
|
<Copyright>colin</Copyright> |
|
|
|
<Description>Use LINGYUN.MicroService.Templates command line</Description> |
|
|
|
<PackAsTool>true</PackAsTool> |
|
|
|
|
|
|
|
@ -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<AbpFeaturesLimitValidationOptions>(options => |
|
|
|
{ |
|
|
|
|
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -40,7 +40,7 @@ public class AbpNotificationsCoreModule : AbpModule |
|
|
|
{ |
|
|
|
var definitionProviders = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(INotificationDefinitionProvider).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -34,7 +34,7 @@ namespace LINGYUN.Abp.Dapr.Actors.AspNetCore |
|
|
|
{ |
|
|
|
var actorRegistrations = new List<ActorRegistration>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(IActor).IsAssignableFrom(context.ImplementationType) && |
|
|
|
!actorRegistrations.Contains(context.ImplementationType)) |
|
|
|
|
|
|
|
@ -21,7 +21,7 @@ namespace LINGYUN.Abp.UI.Navigation |
|
|
|
{ |
|
|
|
var definitionProviders = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(INavigationDefinitionProvider).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -28,7 +28,7 @@ namespace LINGYUN.Abp.Rules.NRules |
|
|
|
{ |
|
|
|
var definitionRules = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(RuleBase).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -27,7 +27,7 @@ public class AbpBackgroundTasksAbstractionsModule : AbpModule |
|
|
|
{ |
|
|
|
var definitionProviders = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(IJobDefinitionProvider).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ public class AbpBackgroundTasksActivitiesModule : AbpModule |
|
|
|
{ |
|
|
|
var definitionProviders = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(IJobActionDefinitionProvider).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -18,7 +18,7 @@ public class AbpWebhooksCoreModule : AbpModule |
|
|
|
{ |
|
|
|
var definitionProviders = new List<Type>(); |
|
|
|
|
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (typeof(IWebhookDefinitionProvider).IsAssignableFrom(context.ImplementationType)) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -79,7 +79,7 @@ namespace LINGYUN.Abp.WorkflowCore |
|
|
|
|
|
|
|
private static void AutoAddDefinitionWorkflows(IServiceCollection services) |
|
|
|
{ |
|
|
|
services.OnRegistred(context => |
|
|
|
services.OnRegistered(context => |
|
|
|
{ |
|
|
|
if (context.ImplementationType.IsWorkflow()) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<AgileConfigClientPackageVersion>1.6.9</AgileConfigClientPackageVersion> |
|
|
|
<VoloAbpPackageVersion>7.1.1</VoloAbpPackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.1.1</LINGYUNAbpPackageVersion> |
|
|
|
<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion> |
|
|
|
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion> |
|
|
|
<DaprPackageVersion>1.10.0</DaprPackageVersion> |
|
|
|
<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<LangVersion>latest</LangVersion> |
|
|
|
<Version>7.1.1</Version> |
|
|
|
<Version>7.2.1</Version> |
|
|
|
<Authors>colin</Authors> |
|
|
|
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn> |
|
|
|
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<VoloAbpPackageVersion>7.1.1</VoloAbpPackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.1.1</LINGYUNAbpPackageVersion> |
|
|
|
<VoloAbpPackageVersion>7.2.1</VoloAbpPackageVersion> |
|
|
|
<LINGYUNAbpPackageVersion>7.2.1</LINGYUNAbpPackageVersion> |
|
|
|
<DaprPackageVersion>1.10.0</DaprPackageVersion> |
|
|
|
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion> |
|
|
|
<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<LangVersion>latest</LangVersion> |
|
|
|
<Version>7.1.1</Version> |
|
|
|
<Version>7.2.1</Version> |
|
|
|
<Authors>colin</Authors> |
|
|
|
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn> |
|
|
|
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl> |
|
|
|
|