From 459926a04e6e4666f929e0c288f2faa95555c964 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 17 Apr 2024 16:33:43 +0800 Subject: [PATCH 1/4] Upgrade AutoMapper to 13.0.1 --- Directory.Packages.props | 2 +- framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj | 2 +- .../Volo/Abp/AutoMapper/AbpAutoMapperModule.cs | 2 +- .../Volo.Abp.BackgroundJobs.Domain.csproj | 2 +- .../Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj | 2 +- .../Volo.Abp.OpenIddict.Domain.csproj | 2 +- .../Volo.Abp.TenantManagement.Domain.csproj | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9624cc0740..9ba7ff757b 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,7 +10,7 @@ - + diff --git a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj index fdf3fef362..f56a92a11e 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj +++ b/framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 enable Nullable Volo.Abp.AutoMapper diff --git a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs index beb3da30c4..fef591ce70 100644 --- a/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs +++ b/framework/src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs @@ -43,7 +43,7 @@ public class AbpAutoMapperModule : AbpModule foreach (var profileType in options.ValidatingProfiles) { - mapperConfiguration.Internal().AssertConfigurationIsValid(((Profile)Activator.CreateInstance(profileType)).ProfileName); + mapperConfiguration.Internal().AssertConfigurationIsValid(((Profile)Activator.CreateInstance(profileType)!).ProfileName); } return mapperConfiguration; diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.csproj index b46209de47..a88ae98514 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.Domain/Volo.Abp.BackgroundJobs.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj index 5a3aa11ea8..ae1703110e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo.Abp.Identity.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Abp.Identity.Domain Volo.Abp.Identity.Domain $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj index abb764270e..997895b1dd 100644 --- a/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj +++ b/modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj index f461433d14..8ff4d73ffb 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Domain/Volo.Abp.TenantManagement.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Abp.TenantManagement.Domain Volo.Abp.TenantManagement.Domain $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; From 1a8581eaed7ab9c5171e76fd86e407d996d5b798 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 17 Apr 2024 16:48:25 +0800 Subject: [PATCH 2/4] Change target formwork --- .../Volo.Abp.BackgroundJobs.MongoDB.csproj | 2 +- .../Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.csproj | 2 +- .../Volo.Abp.TenantManagement.MongoDB.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.csproj b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.csproj index 7d29486644..ebe4bf7aab 100644 --- a/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.csproj +++ b/modules/background-jobs/src/Volo.Abp.BackgroundJobs.MongoDB/Volo.Abp.BackgroundJobs.MongoDB.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.csproj b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.csproj index 96e949d6d5..cc1b206cd2 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.csproj +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo.Abp.Identity.MongoDB.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Abp.Identity.MongoDB Volo.Abp.Identity.MongoDB $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.csproj b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.csproj index d10686b721..df6fa35bb3 100644 --- a/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.csproj +++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.MongoDB/Volo.Abp.TenantManagement.MongoDB.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Abp.TenantManagement.MongoDB Volo.Abp.TenantManagement.MongoDB $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; From ae8843eb0708509756f1ade746b7ea1812c27d8d Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Wed, 17 Apr 2024 17:46:55 +0800 Subject: [PATCH 3/4] Fix unit test --- .../ImageSharpImageCompressor_Tests.cs | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs index 6c7041ab2e..13c3dfc29a 100644 --- a/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs +++ b/framework/test/Volo.Abp.Imaging.ImageSharp.Tests/Volo/Abp/Imaging/ImageSharpImageCompressor_Tests.cs @@ -1,6 +1,9 @@ using System.IO; using System.Threading.Tasks; +using Microsoft.Extensions.DependencyInjection; using Shouldly; +using SixLabors.ImageSharp.Formats.Jpeg; +using SixLabors.ImageSharp.Formats.Webp; using Xunit; namespace Volo.Abp.Imaging; @@ -12,6 +15,24 @@ public class ImageSharpImageCompressor_Tests : AbpImagingImageSharpTestBase { ImageCompressor = GetRequiredService(); } + + protected override void AfterAddApplication(IServiceCollection services) + { + services.Configure(options => + { + options.JpegEncoder = new JpegEncoder + { + Quality = 50 + }; + options.WebpEncoder = new WebpEncoder + { + Quality = 50 + }; + }); + + base.AfterAddApplication(services); + } + [Fact] public async Task Should_Compress_Jpg() { From c132113e04797ec08e4112ef8f6d37b473d26a57 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 22 Apr 2024 10:34:15 +0800 Subject: [PATCH 4/4] Change target formwork --- .../Volo.BloggingTestApp.MongoDB.csproj | 2 +- .../src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj | 2 +- .../src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.csproj | 2 +- modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj | 2 +- modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.csproj b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.csproj index e707190be5..0cdcbcf40d 100644 --- a/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.csproj +++ b/modules/blogging/app/Volo.BloggingTestApp.MongoDB/Volo.BloggingTestApp.MongoDB.csproj @@ -3,7 +3,7 @@ - netstandard2.1 + net8.0 diff --git a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj index 905494aa41..3e2d210d8d 100644 --- a/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj +++ b/modules/blogging/src/Volo.Blogging.Domain/Volo.Blogging.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Blogging.Domain Volo.Blogging.Domain diff --git a/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.csproj b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.csproj index 83d8759d14..1614e3285d 100644 --- a/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.csproj +++ b/modules/blogging/src/Volo.Blogging.MongoDB/Volo.Blogging.MongoDB.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Blogging.MongoDB Volo.Blogging.MongoDB diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index d00f51e923..cc93092b37 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Docs.Domain Volo.Docs.Domain true diff --git a/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.csproj b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.csproj index 25994142c5..753a8b826d 100644 --- a/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.csproj +++ b/modules/docs/src/Volo.Docs.MongoDB/Volo.Docs.MongoDB.csproj @@ -4,7 +4,7 @@ - netstandard2.1 + net8.0 Volo.Docs.MongoDB Volo.Docs.MongoDB