Browse Source

Merge pull request #803 from colinin/rel-7.0.3

upgrade: upgrade abp framework to 7.0.3
pull/808/head
yx lin 3 years ago
committed by GitHub
parent
commit
662a8775a2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      .github/workflows/release.yml
  2. 6
      aspnet-core/Directory.Build.props
  3. 2
      aspnet-core/common.props
  4. 2
      aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/Program.cs
  5. 2
      aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj
  6. 88
      aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/GenerateProxyCommand.cs
  7. 3
      aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/GenerateProxyArgs.cs
  8. 3
      aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.TTS/FodyWeavers.xml
  9. 30
      aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.TTS/FodyWeavers.xsd
  10. 1
      aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj
  11. 1
      aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj
  12. 1
      aspnet-core/services/LY.MicroService.identityServer/LY.MicroService.IdentityServer.csproj
  13. 6
      aspnet-core/templates/content/Directory.Build.props
  14. 2
      aspnet-core/templates/content/common.props
  15. 6
      aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN/Abp/Notifications/FakeNotificationSender.cs
  16. 2
      build/build-aspnetcore-common.ps1
  17. 6
      gateways/Directory.Build.props
  18. 2
      gateways/common.props

4
.github/workflows/release.yml

@ -2,7 +2,7 @@ name: "Tagged Release"
on:
push:
branches: [ rel-7.0.2 ]
branches: [ rel-7.0.3 ]
jobs:
tagged-release:
@ -14,4 +14,4 @@ jobs:
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
prerelease: false
automatic_release_tag: "7.0.2"
automatic_release_tag: "7.0.3"

6
aspnet-core/Directory.Build.props

@ -1,11 +1,11 @@
<Project>
<PropertyGroup>
<VoloAbpPackageVersion>7.0.2</VoloAbpPackageVersion>
<VoloAbpPackageVersion>7.0.3</VoloAbpPackageVersion>
<VoloAbpLeptonXThemePackageVersion>2.0.1</VoloAbpLeptonXThemePackageVersion>
<LINGYUNAbpPackageVersion>7.0.2</LINGYUNAbpPackageVersion>
<LINGYUNAbpPackageVersion>7.0.3</LINGYUNAbpPackageVersion>
<DaprPackageVersion>1.10.0</DaprPackageVersion>
<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
<DotNetCoreCAPPackageVersion>7.0.2</DotNetCoreCAPPackageVersion>
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>
<ElsaPackageVersion>2.10.1</ElsaPackageVersion>
<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>

2
aspnet-core/common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>7.0.2</Version>
<Version>7.0.3</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

2
aspnet-core/migrations/LY.MicroService.Applications.Single.DbMigrator/Program.cs

@ -34,7 +34,7 @@ public class Program
.ConfigureLogging((context, logging) => logging.ClearProviders())
.ConfigureServices((hostContext, services) =>
{
services.AddHostedService<SingleDbMigratorModule>();
services.AddHostedService<SingleDbMigratorHostedService>();
});
}
}

2
aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN.Abp.Cli.csproj

@ -5,7 +5,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<Version>7.0.2</Version>
<Version>7.0.3</Version>
<Copyright>colin</Copyright>
<Description>Use LINGYUN.MicroService.Templates command line</Description>
<PackAsTool>true</PackAsTool>

88
aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/Commands/GenerateProxyCommand.cs

@ -12,6 +12,7 @@ using Volo.Abp.Cli.Commands;
using Volo.Abp.DependencyInjection;
using AbpCliServiceProxyOptions = Volo.Abp.Cli.ServiceProxying.AbpCliServiceProxyOptions;
using IServiceProxyGenerator = Volo.Abp.Cli.ServiceProxying.IServiceProxyGenerator;
using VoloProxyOptions = Volo.Abp.Cli.Commands.ProxyCommandBase<Volo.Abp.Cli.Commands.GenerateProxyCommand>.Options;
using VoloGenerateProxyArgs = Volo.Abp.Cli.ServiceProxying.GenerateProxyArgs;
using ServiceType = Volo.Abp.Cli.ServiceProxying.ServiceType;
@ -58,15 +59,16 @@ public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
var provider = commandLineArgs.Options.GetOrNull(Options.Provider.Short, Options.Provider.Long);
var apiScriptProxy = commandLineArgs.Options.GetOrNull(Options.ApiScriptProxy.Short, Options.ApiScriptProxy.Long) ??
VbenDynamicHttpApiScriptGenerator.Name;
var url = commandLineArgs.Options.GetOrNull(Options.Url.Short, Options.Url.Long);
var target = commandLineArgs.Options.GetOrNull(Options.Target.Long);
var module = commandLineArgs.Options.GetOrNull(Options.Module.Short, Options.Module.Long) ?? "app";
var output = commandLineArgs.Options.GetOrNull(Options.Output.Short, Options.Output.Long);
var apiName = commandLineArgs.Options.GetOrNull(Options.ApiName.Short, Options.ApiName.Long);
var source = commandLineArgs.Options.GetOrNull(Options.Source.Short, Options.Source.Long);
var workDirectory = commandLineArgs.Options.GetOrNull(Options.WorkDirectory.Short, Options.WorkDirectory.Long) ?? Directory.GetCurrentDirectory();
var folder = commandLineArgs.Options.GetOrNull(Options.Folder.Long);
var serviceTypeArg = commandLineArgs.Options.GetOrNull(Options.ServiceType.Short, Options.ServiceType.Long);
var url = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Url.Short, VoloProxyOptions.Url.Long);
var target = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Target.Long);
var module = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Module.Short, VoloProxyOptions.Module.Long) ?? "app";
var output = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Output.Short, VoloProxyOptions.Output.Long);
var apiName = commandLineArgs.Options.GetOrNull(VoloProxyOptions.ApiName.Short, VoloProxyOptions.ApiName.Long);
var source = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Source.Short, VoloProxyOptions.Source.Long);
var workDirectory = commandLineArgs.Options.GetOrNull(VoloProxyOptions.WorkDirectory.Short, VoloProxyOptions.WorkDirectory.Long) ?? Directory.GetCurrentDirectory();
var folder = commandLineArgs.Options.GetOrNull(VoloProxyOptions.Folder.Long);
var serviceTypeArg = commandLineArgs.Options.GetOrNull(VoloProxyOptions.ServiceType.Short, VoloProxyOptions.ServiceType.Long);
var entryPoint = commandLineArgs.Options.GetOrNull(VoloProxyOptions.EntryPoint.Short, VoloProxyOptions.EntryPoint.Long);
ServiceType? serviceType = null;
if (!serviceTypeArg.IsNullOrWhiteSpace())
@ -78,8 +80,8 @@ public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
: null;
}
var withoutContracts = commandLineArgs.Options.ContainsKey(Options.WithoutContracts.Short) ||
commandLineArgs.Options.ContainsKey(Options.WithoutContracts.Long);
var withoutContracts = commandLineArgs.Options.ContainsKey(VoloProxyOptions.WithoutContracts.Short) ||
commandLineArgs.Options.ContainsKey(VoloProxyOptions.WithoutContracts.Long);
return new GenerateProxyArgs(
CommandName,
@ -94,6 +96,7 @@ public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
provider,
apiScriptProxy,
serviceType,
entryPoint,
withoutContracts,
commandLineArgs.Options);
}
@ -158,68 +161,5 @@ public class GenerateProxyCommand : IConsoleCommand, ITransientDependency
public const string Short = "asp";
public const string Long = "api-script-proxy";
}
public static class Module
{
public const string Short = "m";
public const string Long = "module";
}
public static class ApiName
{
public const string Short = "a";
public const string Long = "api-name";
}
public static class Source
{
public const string Short = "s";
public const string Long = "source";
}
public static class Output
{
public const string Short = "o";
public const string Long = "output";
}
public static class Target
{
public const string Long = "target";
}
public static class Prompt
{
public const string Short = "p";
public const string Long = "prompt";
}
public static class Folder
{
public const string Long = "folder";
}
public static class Url
{
public const string Short = "u";
public const string Long = "url";
}
public static class WorkDirectory
{
public const string Short = "wd";
public const string Long = "working-directory";
}
public static class ServiceType
{
public const string Short = "st";
public const string Long = "service-type";
}
public static class WithoutContracts
{
public const string Short = "c";
public const string Long = "without-contracts";
}
}
}

3
aspnet-core/modules/cli/LINGYUN.Abp.Cli/LINGYUN/Abp/Cli/ServiceProxying/GenerateProxyArgs.cs

@ -22,9 +22,10 @@ public class GenerateProxyArgs : Volo.Abp.Cli.ServiceProxying.GenerateProxyArgs
string provider,
string apiScriptProxy,
Volo.Abp.Cli.ServiceProxying.ServiceType? serviceType,
string entryPoint,
bool withoutContracts,
Dictionary<string, string> extraProperties = null)
: base(commandName, workDirectory, module, url, output, target, apiName, source, folder, serviceType, withoutContracts, extraProperties)
: base(commandName, workDirectory, module, url, output, target, apiName, source, folder, serviceType, entryPoint, withoutContracts, extraProperties)
{
ApiScriptProxy = apiScriptProxy;
Provider = provider;

3
aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.TTS/FodyWeavers.xml

@ -0,0 +1,3 @@
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<ConfigureAwait ContinueOnCapturedContext="false" />
</Weavers>

30
aspnet-core/modules/cloud-tencent/LINGYUN.Abp.Tencent.TTS/FodyWeavers.xsd

@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
<!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
<xs:element name="Weavers">
<xs:complexType>
<xs:all>
<xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
</xs:complexType>
</xs:element>
</xs:all>
<xs:attribute name="VerifyAssembly" type="xs:boolean">
<xs:annotation>
<xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="VerifyIgnoreCodes" type="xs:string">
<xs:annotation>
<xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="GenerateXsd" type="xs:boolean">
<xs:annotation>
<xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
</xs:annotation>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:schema>

1
aspnet-core/services/LY.MicroService.BackendAdmin.HttpApi.Host/LY.MicroService.BackendAdmin.HttpApi.Host.csproj

@ -43,6 +43,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\migrations\LY.MicroService.BackendAdmin.EntityFrameworkCore\LY.MicroService.BackendAdmin.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.Auditing.Application\LINGYUN.Abp.Auditing.Application.csproj" />
<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.Auditing.HttpApi\LINGYUN.Abp.Auditing.HttpApi.csproj" />
<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj" />

1
aspnet-core/services/LY.MicroService.TaskManagement.HttpApi.Host/LY.MicroService.TaskManagement.HttpApi.Host.csproj

@ -50,6 +50,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\migrations\LY.MicroService.TaskManagement.EntityFrameworkCore\LY.MicroService.TaskManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\authorization\LINGYUN.Abp.Authorization.OrganizationUnits\LINGYUN.Abp.Authorization.OrganizationUnits.csproj" />
<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.Data.DbMigrator\LINGYUN.Abp.Data.DbMigrator.csproj" />
<ProjectReference Include="..\..\modules\common\LINGYUN.Abp.EventBus.CAP\LINGYUN.Abp.EventBus.CAP.csproj" />

1
aspnet-core/services/LY.MicroService.identityServer/LY.MicroService.IdentityServer.csproj

@ -41,6 +41,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\migrations\LY.MicroService.IdentityServer.EntityFrameworkCore\LY.MicroService.IdentityServer.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\account\LINGYUN.Abp.Account.Application\LINGYUN.Abp.Account.Application.csproj" />
<ProjectReference Include="..\..\modules\auditing\LINGYUN.Abp.AuditLogging.Elasticsearch\LINGYUN.Abp.AuditLogging.Elasticsearch.csproj" />
<ProjectReference Include="..\..\modules\authentication\LINGYUN.Abp.Authentication.QQ\LINGYUN.Abp.Authentication.QQ.csproj" />

6
aspnet-core/templates/content/Directory.Build.props

@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<AgileConfigClientPackageVersion>1.6.9</AgileConfigClientPackageVersion>
<VoloAbpPackageVersion>7.0.2</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>7.0.2</LINGYUNAbpPackageVersion>
<DotNetCoreCAPPackageVersion>7.0.3</DotNetCoreCAPPackageVersion>
<VoloAbpPackageVersion>7.0.3</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>7.0.3</LINGYUNAbpPackageVersion>
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>
<DaprPackageVersion>1.10.0</DaprPackageVersion>
<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
<OpenTelemetryExtensionsHostingPackageVersion>1.0.0-rc8</OpenTelemetryExtensionsHostingPackageVersion>

2
aspnet-core/templates/content/common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>7.0.2</Version>
<Version>7.0.3</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

6
aspnet-core/tests/LINGYUN.Abp.Notifications.Tests/LINGYUN/Abp/Notifications/FakeNotificationSender.cs

@ -25,6 +25,8 @@ public class FakeNotificationSender : INotificationSender, ITransientDependency
protected INotificationStore NotificationStore { get; }
protected INotificationDataSerializer NotificationDataSerializer { get; }
protected IStringLocalizerFactory StringLocalizerFactory { get; }
protected INotificationDefinitionManager NotificationDefinitionManager { get; }
@ -39,6 +41,7 @@ public class FakeNotificationSender : INotificationSender, ITransientDependency
IStringLocalizerFactory stringLocalizerFactory,
IOptions<AbpNotificationsPublishOptions> options,
INotificationStore notificationStore,
INotificationDataSerializer notificationDataSerializer,
INotificationDefinitionManager notificationDefinitionManager,
INotificationSubscriptionManager notificationSubscriptionManager,
INotificationPublishProviderManager notificationPublishProviderManager)
@ -48,6 +51,7 @@ public class FakeNotificationSender : INotificationSender, ITransientDependency
TemplateRenderer = templateRenderer;
StringLocalizerFactory = stringLocalizerFactory;
NotificationStore = notificationStore;
NotificationDataSerializer = notificationDataSerializer;
NotificationDefinitionManager = notificationDefinitionManager;
NotificationSubscriptionManager = notificationSubscriptionManager;
NotificationPublishProviderManager = notificationPublishProviderManager;
@ -81,7 +85,7 @@ public class FakeNotificationSender : INotificationSender, ITransientDependency
};
notificationInfo.SetId(DateTimeOffset.Now.ToUnixTimeMilliseconds());
notificationInfo.Data = NotificationDataConverter.Convert(notificationInfo.Data);
notificationInfo.Data = NotificationDataSerializer.Serialize(notificationInfo.Data);
Logger.LogDebug($"Persistent notification {notificationInfo.Name}");

2
build/build-aspnetcore-common.ps1

@ -22,6 +22,8 @@ $solutionArray += [PsObject]@{ File = $rootFolder + "/../aspnet-core/LINGYUN.Mic
$solutionArray += [PsObject]@{ File = $rootFolder + "/../aspnet-core/LINGYUN.MicroService.TaskManagement.sln" }
$solutionArray += [PsObject]@{ File = $rootFolder + "/../aspnet-core/LINGYUN.MicroService.WebhooksManagement.sln" }
$solutionArray += [PsObject]@{ File = $rootFolder + "/../aspnet-core/LINGYUN.MicroService.Workflow.sln" }
$solutionArray += [PsObject]@{ File = $rootFolder + "/../aspnet-core/LINGYUN.MicroService.SingleProject.sln" }
$solutionArray += [PsObject]@{ File = $rootFolder + "/../gateways/internal/LINGYUN.MicroService.Internal.ApiGateway/LINGYUN.MicroService.Internal.ApiGateway.sln" }
Write-host ""
Write-host ":::::::::::::: !!! You are in development mode !!! ::::::::::::::" -ForegroundColor red -BackgroundColor yellow

6
gateways/Directory.Build.props

@ -1,9 +1,9 @@
<Project>
<PropertyGroup>
<VoloAbpPackageVersion>7.0.2</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>7.0.2</LINGYUNAbpPackageVersion>
<VoloAbpPackageVersion>7.0.3</VoloAbpPackageVersion>
<LINGYUNAbpPackageVersion>7.0.3</LINGYUNAbpPackageVersion>
<DaprPackageVersion>1.10.0</DaprPackageVersion>
<DotNetCoreCAPPackageVersion>7.0.2</DotNetCoreCAPPackageVersion>
<DotNetCoreCAPPackageVersion>7.1.0</DotNetCoreCAPPackageVersion>
<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
<AgileConfigClientPackageVersion>1.2.1.5</AgileConfigClientPackageVersion>

2
gateways/common.props

@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>7.0.2</Version>
<Version>7.0.3</Version>
<Authors>colin</Authors>
<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>

Loading…
Cancel
Save