upgrade abp framework to 8.1.0

colinin · Apr 13, 2024 · cc96d9c · cc96d9c
1 parent 338ddec
commit cc96d9c
Show file tree

Hide file tree

Showing 94 changed files with 2,550 additions and 522 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -2,7 +2,7 @@ name: "Publish"
 
 on:
   push:
-    branches: [ rel-8.0.3 ]
+    branches: [ rel-8.1.0 ]
 env:
   DOTNET_VERSION: "8.0.200"
 

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -2,7 +2,7 @@ name: "Tagged Release"
 
 on:
   push:
-    branches: [ rel-8.0.3 ]
+    branches: [ rel-8.1.0 ]
 
 jobs:
   tagged-release:
@@ -14,4 +14,4 @@ jobs:
       with:
         repo_token: "${{ secrets.GITHUB_TOKEN }}"
         prerelease: false
-        automatic_release_tag: "8.0.3"
+        automatic_release_tag: "8.1.0"
diff --git a/aspnet-core/Directory.Build.props b/aspnet-core/Directory.Build.props
@@ -1,11 +1,11 @@
 <Project>
 	<PropertyGroup>
-		<VoloAbpPackageVersion>8.0.4</VoloAbpPackageVersion>
+		<VoloAbpPackageVersion>8.1.0</VoloAbpPackageVersion>
 		<VoloAbpLeptonXThemePackageVersion>3.0.0</VoloAbpLeptonXThemePackageVersion>
-		<LINGYUNAbpPackageVersion>8.0.4</LINGYUNAbpPackageVersion>
+		<LINGYUNAbpPackageVersion>8.1.0</LINGYUNAbpPackageVersion>
 		<DaprPackageVersion>1.12.0</DaprPackageVersion>
 		<DistributedLockRedisPackageVersion>1.0.2</DistributedLockRedisPackageVersion>
-		<DotNetCoreCAPPackageVersion>8.0.0</DotNetCoreCAPPackageVersion>
+		<DotNetCoreCAPPackageVersion>8.1.0</DotNetCoreCAPPackageVersion>
 		<ElsaPackageVersion>2.14.1</ElsaPackageVersion>
 		<AliyunSDKPackageVersion>1.5.10</AliyunSDKPackageVersion>
 		<AliyunOSSSDKPackageVersion>2.13.0</AliyunOSSSDKPackageVersion>
@@ -15,11 +15,11 @@
 		<HangfireMSSQLStoragePackageVersion>1.8.6</HangfireMSSQLStoragePackageVersion>
 		<NESTPackageVersion>7.15.1</NESTPackageVersion>
 		<NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
-		<OpenTelemetryExtensionsHostingPackageVersion>1.0.0-rc8</OpenTelemetryExtensionsHostingPackageVersion>
-		<OpenTelemetryExporterZipkinPackageVersion>1.3.1</OpenTelemetryExporterZipkinPackageVersion>
-		<OpenTelemetryInstrumentationAspNetCorePackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationAspNetCorePackageVersion>
-		<OpenTelemetryInstrumentationHttpPackageVersion>1.0.0-rc8</OpenTelemetryInstrumentationHttpPackageVersion>
-		<OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta2</OpenTelemetryContribInstrumentationEntityFrameworkCorePackageVersion>
+		<OpenTelemetryExtensionsHostingPackageVersion>1.8.0</OpenTelemetryExtensionsHostingPackageVersion>
+		<OpenTelemetryExporterZipkinPackageVersion>1.8.0</OpenTelemetryExporterZipkinPackageVersion>
+		<OpenTelemetryInstrumentationAspNetCorePackageVersion>1.8.1</OpenTelemetryInstrumentationAspNetCorePackageVersion>
+		<OpenTelemetryInstrumentationHttpPackageVersion>1.8.1</OpenTelemetryInstrumentationHttpPackageVersion>
+		<OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion>1.0.0-beta.11</OpenTelemetryInstrumentationEntityFrameworkCorePackageVersion>
 		<QuartzNETPackageVersion>3.7.0</QuartzNETPackageVersion>
 		<StackExchangeRedisPackageVersion>2.7.4</StackExchangeRedisPackageVersion>
 		<SerilogPackageVersion>3.1.1</SerilogPackageVersion>

diff --git a/aspnet-core/common.props b/aspnet-core/common.props
@@ -1,12 +1,12 @@
 <Project>
 	<PropertyGroup>
 		<LangVersion>latest</LangVersion>
-		<Version>8.0.4</Version>
+		<Version>8.1.0</Version>
 		<Authors>colin</Authors>
 		<NoWarn>$(NoWarn);CS1591;CS0436;CS8618;NU1803</NoWarn>
 		<PackageProjectUrl>https://github.com/colinin/abp-next-admin</PackageProjectUrl>
 		<PackageOutputPath>$(SolutionDir)LocalNuget</PackageOutputPath>
-		<PackageVersion>8.0.3</PackageVersion>
+		<PackageVersion>8.1.0</PackageVersion>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<RepositoryType>git</RepositoryType>
 		<RepositoryUrl>https://github.com/colinin/abp-next-admin</RepositoryUrl>

diff --git a/....Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs b/....Aliyun.SettingManagement/LINGYUN/Abp/Aliyun/SettingManagement/AliyunSettingController.cs
@@ -2,15 +2,14 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.AspNetCore.Mvc;
 
 namespace LINGYUN.Abp.Aliyun.SettingManagement
 {
     [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
     [Area("settingManagement")]
     [Route("api/setting-management/aliyun")]
-    public class AliyunSettingController : AbpController, IAliyunSettingAppService
+    public class AliyunSettingController : AbpControllerBase, IAliyunSettingAppService
     {
         protected IAliyunSettingAppService AppService { get; }
 

diff --git a/...AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageController.cs b/...AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/LanguageController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
     [Area("abp")]
     [RemoteService(Name = "abp")]
     [Route("api/abp/localization/languages")]
-    public class LanguageController : AbpController, ILanguageAppService
+    public class LanguageController : AbpControllerBase, ILanguageAppService
     {
         private readonly ILanguageAppService _service;
 

diff --git a/...AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs b/...AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/ResourceController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
     [Area("abp")]
     [RemoteService(Name = "abp")]
     [Route("api/abp/localization/resources")]
-    public class ResourceController : AbpController, IResourceAppService
+    public class ResourceController : AbpControllerBase, IResourceAppService
     {
         private readonly IResourceAppService _service;
 

diff --git a/...Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextController.cs b/...Abp.AspNetCore.Mvc.Localization/LINGYUN/Abp/AspNetCore/Mvc/Localization/TextController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.AspNetCore.Mvc.Localization
     [Area("abp")]
     [RemoteService(Name = "abp")]
     [Route("api/abp/localization/texts")]
-    public class TextController : AbpController, ITextAppService
+    public class TextController : AbpControllerBase, ITextAppService
     {
         private readonly ITextAppService _service;
 

diff --git a/...lus.SettingManagement/LINGYUN/Abp/PushPlus/SettingManagement/PushPlusSettingController.cs b/...lus.SettingManagement/LINGYUN/Abp/PushPlus/SettingManagement/PushPlusSettingController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.PushPlus.SettingManagement
     [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
     [Area(AbpSettingManagementRemoteServiceConsts.ModuleName)]
     [Route($"api/{AbpSettingManagementRemoteServiceConsts.ModuleName}/push-plus")]
-    public class WxPusherSettingController : AbpController, IPushPlusSettingAppService
+    public class WxPusherSettingController : AbpControllerBase, IPushPlusSettingAppService
     {
         protected IPushPlusSettingAppService Service { get; }
 

diff --git a/....WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs b/....WeChat.SettingManagement/LINGYUN/Abp/WeChat/SettingManagement/WeChatSettingController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.WeChat.SettingManagement
     [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
     [Area("settingManagement")]
     [Route("api/setting-management/wechat")]
-    public class WeChatSettingController : AbpController, IWeChatSettingAppService
+    public class WeChatSettingController : AbpControllerBase, IWeChatSettingAppService
     {
         protected IWeChatSettingAppService WeChatSettingAppService { get; }
 

diff --git a/...her.SettingManagement/LINGYUN/Abp/WxPusher/SettingManagement/WxPusherSettingController.cs b/...her.SettingManagement/LINGYUN/Abp/WxPusher/SettingManagement/WxPusherSettingController.cs
@@ -9,7 +9,7 @@ namespace LINGYUN.Abp.WxPusher.SettingManagement
     [RemoteService(Name = AbpSettingManagementRemoteServiceConsts.RemoteServiceName)]
     [Area(AbpSettingManagementRemoteServiceConsts.ModuleName)]
     [Route($"api/{AbpSettingManagementRemoteServiceConsts.ModuleName}/wx-pusher")]
-    public class WxPusherSettingController : AbpController, IWxPusherSettingAppService
+    public class WxPusherSettingController : AbpControllerBase, IWxPusherSettingAppService
     {
         protected IWxPusherSettingAppService Service { get; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ name: "Publish" @@
     on:
       push:
-        branches: [ rel-8.0.3 ]
+        branches: [ rel-8.1.0 ]
     env:
       DOTNET_VERSION: "8.0.200"
@@ Expand Down @@