Skip to content

Commit b4f9bf9

Browse files
Update package dependencies and min ver number
1 parent 9ac4cd9 commit b4f9bf9

File tree

6 files changed

+21
-21
lines changed

6 files changed

+21
-21
lines changed

src/ImageSharp/ImageSharp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
</PropertyGroup>
2323

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

2929
<Choose>

tests/Directory.Build.targets

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,18 @@
1818

1919
<ItemGroup>
2020
<!-- Test Dependencies -->
21-
<PackageReference Update="BenchmarkDotNet" Version="0.13.0" />
22-
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.0" Condition="'$(IsWindows)'=='true'" />
23-
<PackageReference Update="Colourful" Version="3.0.0" />
24-
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="12.2.2" />
21+
<PackageReference Update="Colourful" Version="3.1.0" />
22+
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.4.0" />
2523
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
2624
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
27-
<PackageReference Update="Moq" Version="4.14.6" />
28-
<PackageReference Update="NetVips" Version="2.0.1" />
29-
<PackageReference Update="NetVips.Native" Version="8.11.0" />
30-
<PackageReference Update="PhotoSauce.MagicScaler" Version="0.12.1" />
31-
<PackageReference Update="Pfim" Version="0.9.1" />
32-
<PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="'$(IsOSX)'=='true'" />
25+
<PackageReference Update="Moq" Version="4.20.70" />
26+
<PackageReference Update="NetVips" Version="2.4.0" />
27+
<PackageReference Update="NetVips.Native" Version="8.15.0" />
28+
<PackageReference Update="PhotoSauce.MagicScaler" Version="0.14.0" />
29+
<PackageReference Update="Pfim" Version="0.11.2" />
30+
<PackageReference Update="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="6.0.5.128" Condition="'$(IsOSX)'=='true'" />
3331
<PackageReference Update="SharpZipLib" Version="1.4.2" />
34-
<PackageReference Update="SkiaSharp" Version="2.80.2" />
32+
<PackageReference Update="SkiaSharp" Version="2.88.6" />
3533
<PackageReference Update="System.Drawing.Common" Version="6.0.0" />
3634
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
3735
</ItemGroup>

tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
<ItemGroup>
4343
<PackageReference Include="Magick.NET-Q16-AnyCPU" />
44-
<PackageReference Include="BenchmarkDotNet" />
45-
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
44+
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
45+
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Version="0.13.10" Condition="'$(IsWindows)'=='true'" />
4646
<PackageReference Include="Colourful" />
4747
<PackageReference Include="NetVips" />
4848
<PackageReference Include="NetVips.Native" />

tests/ImageSharp.Benchmarks/LoadResizeSave/LoadResizeSaveStressRunner.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,7 @@ public void MagicScalerResize(string input)
269269
Width = this.ThumbnailSize,
270270
Height = this.ThumbnailSize,
271271
ResizeMode = CropScaleMode.Max,
272-
SaveFormat = FileFormat.Jpeg,
273-
JpegQuality = Quality,
274-
JpegSubsampleMode = ChromaSubsampleMode.Subsample420
272+
EncoderOptions = new JpegEncoderOptions(Quality, ChromaSubsampleMode.Subsample420, true)
275273
};
276274

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

345343
// Save the results
346-
thumb.Jpegsave(this.OutputPath(input), q: Quality, strip: true);
344+
thumb.Jpegsave(this.OutputPath(input), q: Quality, keep: NetVips.Enums.ForeignKeep.None);
347345
}
348346
}

tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Condition="'$(IsOSX)'=='true'" />
4444
<PackageReference Include="SkiaSharp" />
4545
<PackageReference Include="System.Drawing.Common" />
46-
<PackageReference Include="CommandLineParser" Version="2.8.0" />
46+
<PackageReference Include="CommandLineParser" Version="2.9.1" />
4747
</ItemGroup>
4848

4949
<ItemGroup>

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@
3535
</ItemGroup>
3636

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

0 commit comments

Comments
 (0)