Merge pull request #18003 from abpframework/auto-merge/rel-7-4/2253

Merge branch dev with rel-7.4

Directory.Packages.props

@@ -138,8 +138,8 @@
     <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageVersion Include="SharpZipLib" Version="1.4.2" />
     <PackageVersion Include="Shouldly" Version="4.0.3" />
-    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.6" />
-    <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.0.2" />
+    <PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.0.0" />
     <PackageVersion Include="Slugify.Core" Version="4.0.1" />
     <PackageVersion Include="Spectre.Console" Version="0.47.0" />
     <PackageVersion Include="StackExchange.Redis" Version="2.6.122" />

docs/en/Migration-Guides/Abp-8_0.md

@@ -66,7 +66,7 @@ The following NuGet libraries have been upgraded:
 | Serilog.Sinks.Async | 1.4.0       | 1.5.0       |
 | SharpZipLib | 1.3.3       | 1.4.2       |
 | Shouldly | 4.1.0       | 4.2.1       |
-| SixLabors.ImageSharp | 1.0.4       | 2.1.6       |
+| SixLabors.ImageSharp | 1.0.4       | 3.0.2       |
 | Slugify.Core | 3.0.0       | 4.0.1       |
 | Spectre.Console | 0.46.1-preview.0.7       | 0.47.0       |
 | Swashbuckle.AspNetCore | 6.2.1       | 6.5.0       |

framework/src/Volo.Abp.Imaging.ImageSharp/Volo.Abp.Imaging.ImageSharp.csproj

@@ -4,7 +4,7 @@
     <Import Project="..\..\..\common.props" />
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;</TargetFrameworks>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <WarningsAsErrors>Nullable</WarningsAsErrors>
         <PackageId>Volo.Abp.Imaging.ImageSharp</PackageId>

framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpCompressOptions.cs

@@ -22,7 +22,7 @@ public class ImageSharpCompressOptions
         
         PngEncoder = new PngEncoder {
             CompressionLevel = PngCompressionLevel.BestCompression,
-            IgnoreMetadata = true
+            SkipMetadata = true
         };
         
         WebpEncoder = new WebpEncoder {

framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageCompressorContributor.cs

@@ -34,14 +34,14 @@ public class ImageSharpImageCompressorContributor : IImageCompressorContributor,
             return new ImageCompressResult<Stream>(stream, ImageProcessState.Unsupported);
         }
 
-        var (image, format) = await Image.LoadWithFormatAsync(stream, cancellationToken);
+        var image = await Image.LoadAsync(stream, cancellationToken);
 
-        if (!CanCompress(format.DefaultMimeType))
+        if (!CanCompress(image.Metadata.DecodedImageFormat!.DefaultMimeType))
         {
             return new ImageCompressResult<Stream>(stream, ImageProcessState.Unsupported);
         }
 
-        var memoryStream = await GetStreamFromImageAsync(image, format, cancellationToken);
+        var memoryStream = await GetStreamFromImageAsync(image, image.Metadata.DecodedImageFormat, cancellationToken);
 
         if (memoryStream.Length < stream.Length)
         {

framework/src/Volo.Abp.Imaging.ImageSharp/Volo/Abp/Imaging/ImageSharpImageResizerContributor.cs

@@ -24,9 +24,9 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
             return new ImageResizeResult<Stream>(stream, ImageProcessState.Unsupported);
         }
 
-        var (image, format) = await Image.LoadWithFormatAsync(stream, cancellationToken);
+        var image = await Image.LoadAsync(stream, cancellationToken);
 
-        if (!CanResize(format.DefaultMimeType))
+        if (!CanResize(image.Metadata.DecodedImageFormat!.DefaultMimeType))
         {
             return new ImageResizeResult<Stream>(stream, ImageProcessState.Unsupported);
         }
@@ -44,7 +44,7 @@ public class ImageSharpImageResizerContributor : IImageResizerContributor, ITran
 
         try
         {
-            await image.SaveAsync(memoryStream, format, cancellationToken: cancellationToken);
+            await image.SaveAsync(memoryStream, image.Metadata.DecodedImageFormat, cancellationToken: cancellationToken);
             memoryStream.Position = 0;
             return new ImageResizeResult<Stream>(memoryStream, ImageProcessState.Done);
         }

modules/blogging/src/Volo.Blogging.Application/Volo/Blogging/Files/ImageFormatHelper.cs

@@ -10,9 +10,9 @@ namespace Volo.Blogging.Areas.Blog.Helpers
     {
         public static IImageFormat GetImageRawFormat(Stream stream)
         {
-            using (var image = Image.Load(stream, out var imageFormat))
+            using (var image = Image.Load(stream))
             {
-                return imageFormat;
+                return image.Metadata.DecodedImageFormat;
             }
         }
 

modules/cms-kit/src/Volo.CmsKit.Public.Web/Security/Captcha/SimpleMathsCaptchaGenerator.cs

@@ -116,9 +116,11 @@ public class SimpleMathsCaptchaGenerator : ITransientDependency
             var random = new Random();
             var startWith = (byte)random.Next(5, 10);
             image.Mutate(ctx => ctx.BackgroundColor(Color.Transparent));
+
             var fontFamily = SystemFonts.Families
                 .FirstOrDefault(x => x.GetAvailableStyles().Contains(options.FontStyle), SystemFonts.Families.First())
                 .Name;
+
             var font = SystemFonts.CreateFont(fontFamily, options.FontSize, options.FontStyle);
             
             foreach (var character in stringText)
@@ -127,7 +129,10 @@ public class SimpleMathsCaptchaGenerator : ITransientDependency
                 var color = options.TextColor[random.Next(0, options.TextColor.Length)];
                 var location = new PointF(startWith + position, random.Next(6, 13));
                 image.Mutate(ctx => ctx.DrawText(text, font, color, location));
-                position += TextMeasurer.MeasureSize(character.ToString(), new TextOptions(font)).Width;
+                position += TextMeasurer.MeasureSize(character.ToString(), new TextOptions (font)
+                {
+                    Origin = location
+                }).Width;
             }
 
             //add rotation
@@ -163,7 +168,7 @@ public class SimpleMathsCaptchaGenerator : ITransientDependency
                 img.Mutate(
                         ctx => ctx
                             .DrawLine(options.NoiseRateColor[random.Next(0, options.NoiseRateColor.Length)],
-                                RandomTextGenerator.GenerateNextFloat(0.5, 1.5), new (x0, y0), new (x0 + 0.01f, y0 + 0.01f))
+                            RandomTextGenerator.GenerateNextFloat(0.5, 1.5), new PointF[] { new Vector2(x0, y0), new Vector2(x0, y0) })
                     );
             });
 

modules/cms-kit/src/Volo.CmsKit.Public.Web/Volo.CmsKit.Public.Web.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Volo.CmsKit.Common.Web\Volo.CmsKit.Common.Web.csproj" />
-	<ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
+	  <ProjectReference Include="..\Volo.CmsKit.Public.Application.Contracts\Volo.CmsKit.Public.Application.Contracts.csproj" />
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" />
     <PackageReference Include="Markdig.Signed" />
     <PackageReference Include="HtmlSanitizer" />