Update ImageSharp.

Older versions have a security vulnerability, which has forced us to use the latest version which no longer supports .NET Standard. A shame, but life goes on.
Nihlus · Mar 8, 2024 · 359a604 · 359a604
1 parent a986083
commit 359a604
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,6 +6,10 @@
         <UseSPDXFileHeaders>true</UseSPDXFileHeaders>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <TargetNetStandard>false</TargetNetStandard>
+    </PropertyGroup>
+
     <!-- NuGet-related properties -->
     <PropertyGroup>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -3,7 +3,7 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="SixLabors.ImageSharp" Version="2.1.6" />
+    <PackageVersion Include="SixLabors.ImageSharp" Version="3.1.3" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
 </Project>
diff --git a/Puzzle.Tests/Data/SampleImages.cs b/Puzzle.Tests/Data/SampleImages.cs
@@ -9,6 +9,7 @@
 using System.Reflection;
 using System.Threading;
 using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats;
 using SixLabors.ImageSharp.PixelFormats;
 
 namespace Puzzle.Tests.Data;
@@ -248,7 +249,12 @@ private static Lazy<Image<L8>> GetLazyLoaderForImage(string image)
                 var imageConfiguration = Configuration.Default.Clone();
                 imageConfiguration.PreferContiguousImageBuffers = true;
 
-                return Image.Load<L8>(imageConfiguration, resourceStream);
+                var decoderOptions = new DecoderOptions
+                {
+                    Configuration = imageConfiguration
+                };
+
+                return Image.Load<L8>(decoderOptions, resourceStream);
             },
             LazyThreadSafetyMode.ExecutionAndPublication
         );

diff --git a/Puzzle/Puzzle.csproj b/Puzzle/Puzzle.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Remora.Sdk">
 
-    <PropertyGroup>
-        <LibraryFrameworks>$(LibraryFrameworks);netstandard2.0</LibraryFrameworks>
-    </PropertyGroup>
-
     <PropertyGroup>
         <Title>Puzzle#</Title>
         <Description>A C# implementation of libpuzzle (an image fingerprinting algorithm)</Description>