update to ImageSharp v3 (#414)

Author: SimonCropp

readme.md

@@ -34,15 +34,15 @@ public static void Init() =>
 public Task VerifyImageFile() =>
     VerifyFile("sample.jpg");
 ```
-<sup><a href='/src/Tests/Samples.cs#L7-L13' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimagefile' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Samples.cs#L4-L10' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimagefile' title='Start of snippet'>anchor</a></sup>
 <a id='snippet-verifyimagefile-1'></a>
 ```cs
 [Test]
 public Task VerifyImageFileWithCustomEncoder() =>
     VerifyFile("sample.jpg")
         .EncodeAsPng();
 ```
-<sup><a href='/src/Tests/Samples.cs#L15-L22' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimagefile-1' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Samples.cs#L12-L19' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimagefile-1' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 Two files are produced
@@ -90,7 +90,7 @@ public Task VerifyImage()
     return Verify(image);
 }
 ```
-<sup><a href='/src/Tests/Samples.cs#L24-L36' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimage' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Tests/Samples.cs#L21-L33' title='Snippet source file'>snippet source</a> | <a href='#snippet-verifyimage' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;CS0649</NoWarn>
-    <Version>4.1.0</Version>
+    <Version>4.2.0</Version>
     <ImplicitUsings>enable</ImplicitUsings>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>ImageSharp, Verify</PackageTags>

src/Tests/Samples.VerifyImageFile.verified.jpg

@@ -1,7 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.PixelFormats;
-
-[TestFixture]
+[TestFixture]
 public class Samples
 {
     #region VerifyImageFile

src/Tests/Samples.VerifyImageWithCustomEncoder.verified.jpg

@@ -6,9 +6,9 @@
   <ItemGroup>
     <PackageReference Include="Argon" Version="0.4.0" />
     <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.5.1" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="Verify.DiffPlex" Version="2.2.0" />
     <PackageReference Include="Verify.NUnit" Version="19.10.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />

src/Tests/Samples.cs

@@ -1,6 +1,4 @@
-using SixLabors.ImageSharp;
-
-static class InfoBuilder
+static class InfoBuilder
 {
     public static object GetInfo(this Image image)
     {

src/Tests/Tests.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="3.0.0" />
     <PackageReference Include="ProjectDefaults" Version="1.0.87" PrivateAssets="all" />
     <PackageReference Include="Verify" Version="19.10.0" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />

src/Verify.ImageSharp/InfoBuilder.cs

@@ -1,5 +1,4 @@
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.Formats.Bmp;
 using SixLabors.ImageSharp.Formats.Gif;
 using SixLabors.ImageSharp.Formats.Jpeg;
@@ -86,25 +85,24 @@ public static void EncodeAsJpeg(this VerifySettings settings, JpegEncoder? encod
 
 
     static ConversionResult ConvertBmp(Stream stream, IReadOnlyDictionary<string, object> context) =>
-        Convert<BmpDecoder, BmpEncoder>(stream, "bmp", context);
+        Convert<BmpEncoder>(BmpDecoder.Instance, stream, "bmp", context);
 
     static ConversionResult ConvertGif(Stream stream, IReadOnlyDictionary<string, object> context) =>
-        Convert<GifDecoder, GifEncoder>(stream, "gif", context);
+        Convert<GifEncoder>(GifDecoder.Instance, stream, "gif", context);
 
     static ConversionResult ConvertJpg(Stream stream, IReadOnlyDictionary<string, object> context) =>
-        Convert<JpegDecoder, JpegEncoder>(stream, "jpg", context);
+        Convert<JpegEncoder>(JpegDecoder.Instance, stream, "jpg", context);
 
     static ConversionResult ConvertPng(Stream stream, IReadOnlyDictionary<string, object> context) =>
-        Convert<PngDecoder, PngEncoder>(stream, "png", context);
+        Convert<PngEncoder>(PngDecoder.Instance, stream, "png", context);
 
     static ConversionResult ConvertTiff(Stream stream, IReadOnlyDictionary<string, object> context) =>
-        Convert<TiffDecoder, TiffEncoder>(stream, "tif", context);
+        Convert<TiffEncoder>(TiffDecoder.Instance, stream, "tif", context);
 
-    static ConversionResult Convert<TDecoder, TEncoder>(Stream stream, string extension, IReadOnlyDictionary<string, object> context)
-        where TDecoder : IImageDecoder, new()
+    static ConversionResult Convert<TEncoder>(IImageDecoder decoder, Stream stream, string extension, IReadOnlyDictionary<string, object> context)
         where TEncoder : IImageEncoder, new()
     {
-        using var image = Image.Load(stream, new TDecoder());
+        using var image = decoder.Decode(new(), stream);
         stream.Position = 0;
         return ConvertImage(image, context, extension, new TEncoder());
     }