Update package dependencies and min ver number

2 years ago · b4f9bf963b
6 changed files with 21 additions and 21 deletions
--- a/src/ImageSharp/ImageSharp.csproj
+++ b/src/ImageSharp/ImageSharp.csproj
@ -22,8 +22,8 @@
  </PropertyGroup>

  <PropertyGroup>
-    <!--Bump to v3.1 prior to tagged release.-->
-    <MinVerMinimumMajorMinor>3.1</MinVerMinimumMajorMinor>
+    <!--Bump to v4.0 prior to tagged release.-->
+    <MinVerMinimumMajorMinor>4.0</MinVerMinimumMajorMinor>
  </PropertyGroup>

  <Choose>
--- a/tests/Directory.Build.targets
+++ b/tests/Directory.Build.targets
@ -18,20 +18,18 @@

  <ItemGroup>
    <!-- Test Dependencies -->
-    <PackageReference Update="BenchmarkDotNet" Version="0.13.0" />
-    <PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" Condition="'$(IsWindows)'=='true'" />
-    <PackageReference Update="Colourful" Version="3.0.0" />
-    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="12.2.2" />
+    <PackageReference Update="Colourful" Version="3.1.0" />
+    <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.4.0" />
    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
    <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
-    <PackageReference Update="Moq" Version="4.14.6" />
-    <PackageReference Update="NetVips" Version="2.0.1" />
-    <PackageReference Update="NetVips.Native" Version="8.11.0" />
-    <PackageReference Update="PhotoSauce.MagicScaler" Version="0.12.1" />
-    <PackageReference Update="Pfim" Version="0.9.1" />
-    <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
+    <PackageReference Update="Moq" Version="4.20.70" />
+    <PackageReference Update="NetVips" Version="2.4.0" />
+    <PackageReference Update="NetVips.Native" Version="8.15.0" />
+    <PackageReference Update="PhotoSauce.MagicScaler" Version="0.14.0" />
+    <PackageReference Update="Pfim" Version="0.11.2" />
+    <PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" Condition="'$(IsOSX)'=='true'" />
    <PackageReference Update="SharpZipLib" Version="1.4.2" />
-    <PackageReference Update="SkiaSharp" Version="2.80.2" />
+    <PackageReference Update="SkiaSharp" Version="2.88.6" />
    <PackageReference Update="System.Drawing.Common" Version="6.0.0" />
    <PackageReference Update="System.IO.Compression" Version="4.3.0" />
  </ItemGroup>
--- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
+++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
@ -41,8 +41,8 @@

  <ItemGroup>
    <PackageReference Include="Magick.NET-Q16-AnyCPU" />
-    <PackageReference Include="BenchmarkDotNet" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" Condition="'$(IsWindows)'=='true'" />
    <PackageReference Include="Colourful" />
    <PackageReference Include="NetVips" />
    <PackageReference Include="NetVips.Native" />
--- a/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs
+++ b/tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs
@ -269,9 +269,7 @@ public class LoadResizeSaveStressRunner
            Width = this.ThumbnailSize,
            Height = this.ThumbnailSize,
            ResizeMode = CropScaleMode.Max,
-            SaveFormat = FileFormat.Jpeg,
-            JpegQuality = Quality,
-            JpegSubsampleMode = ChromaSubsampleMode.Subsample420
+            EncoderOptions = new JpegEncoderOptions(Quality, ChromaSubsampleMode.Subsample420, true)
        };

        // TODO: Is there a way to capture input dimensions for IncreaseTotalMegapixels?
@ -343,6 +341,6 @@ public class LoadResizeSaveStressRunner
        using var thumb = NetVipsImage.Thumbnail(input, this.ThumbnailSize, this.ThumbnailSize);

        // Save the results
-        thumb.Jpegsave(this.OutputPath(input), q: Quality, strip: true);
+        thumb.Jpegsave(this.OutputPath(input), q: Quality, keep: NetVips.Enums.ForeignKeep.None);
    }
 }
--- a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
+++ b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj
@ -43,7 +43,7 @@
    <PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Condition="'$(IsOSX)'=='true'" />
    <PackageReference Include="SkiaSharp" />
    <PackageReference Include="System.Drawing.Common" />
-    <PackageReference Include="CommandLineParser" Version="2.8.0" />
+    <PackageReference Include="CommandLineParser" Version="2.9.1" />
  </ItemGroup>

  <ItemGroup>
--- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
+++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj
@ -35,7 +35,11 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" />
+    <!--
+        Do not update or consolidate BenchmarkDotNet.
+        https://github.com/dotnet/arcade/issues/8483
+      -->
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.0"  />
    <PackageReference Include="Magick.NET-Q16-AnyCPU" />
    <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />