Skip to content

Commit 4e61d87

Browse files
JimBobSquarePantsJimBobSquarePants
authored
Merge pull request #1378 from SixLabors/js/update-dependencies
Update Dependencies
2 parents 70d636d + 314e9f6 commit 4e61d87

16 files changed

+102
-101
lines changed

‎.runsettings‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<RunSettings>
3+
<RunConfiguration>
4+
<!--Used in conjunction with ActiveIssueAttribute to skip tests with known issues-->
5+
<TestCaseFilter>category!=failing</TestCaseFilter>
6+
</RunConfiguration>
7+
</RunSettings>

‎Directory.Build.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
1616
<BaseArtifactsPathSuffix>$(SixLaborsProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
1717
<RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp/</RepositoryUrl>
18+
<RunSettingsFilePath>$(MSBuildThisFileDirectory)/.runsettings</RunSettingsFilePath>
1819
</PropertyGroup>
1920

2021
<!-- Default settings that explicitly differ from the Sdk.props defaults -->

‎Directory.Build.targets‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,18 @@
1818
<!-- Package versions for package references across all projects -->
1919
<ItemGroup>
2020
<!--Global Dependencies-->
21-
<PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.3.1" />
21+
<PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.7.0" />
2222
<PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
2323
<PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
2424

2525
<!--Src Dependencies-->
2626
<PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
27-
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
27+
<PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.1" />
2828
<PackageReference Update="System.Buffers" Version="4.5.1" />
2929
<PackageReference Update="System.IO.Compression" Version="4.3.0" />
3030
<PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
3131
<PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
32-
<!--
33-
Do no update System.Memory as it currently breaks the CI build
34-
with FileNotFoundException for SixLabors.ImageSharp.Tests.dll.config
35-
-->
36-
<PackageReference Update="System.Memory" Version="4.5.3" />
32+
<PackageReference Update="System.Memory" Version="4.5.4" />
3733
<PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
3834
<PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
3935
<PackageReference Update="System.ValueTuple" Version="4.5.0" />

‎ImageSharp.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
99
.gitattributes = .gitattributes
1010
.gitignore = .gitignore
1111
.gitmodules = .gitmodules
12+
.runsettings = .runsettings
1213
ci-build.ps1 = ci-build.ps1
1314
ci-pack.ps1 = ci-pack.ps1
1415
ci-test.ps1 = ci-test.ps1

‎tests/Directory.Build.targets‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@
2626
<ItemGroup>
2727
<!--Test Dependencies-->
2828
<PackageReference Update="BenchmarkDotNet" Version="0.12.1" />
29-
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" Condition="'$(OS)' == 'Windows_NT'" />
29+
<PackageReference Update="BenchmarkDotNet.Diagnostics.Windows" Version="0.12.1" Condition="'$(OS)' == 'Windows_NT'" />
3030
<PackageReference Update="Colourful" Version="2.0.5" />
3131
<PackageReference Update="coverlet.collector" Version="1.3.1-preview.27.gdd2237a3be" PrivateAssets="All"/>
3232
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.22.0" />
33-
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
34-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
35-
<PackageReference Update="Moq" Version="4.14.5" />
33+
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20513.1" />
34+
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20513.1" />
35+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
36+
<PackageReference Update="Moq" Version="4.14.6" />
3637
<PackageReference Update="Pfim" Version="0.9.1" />
37-
<PackageReference Update="SharpZipLib" Version="1.2.0" />
38+
<PackageReference Update="SharpZipLib" Version="1.3.0" />
3839
<PackageReference Update="System.Drawing.Common" Version="4.7.0" />
3940
<PackageReference Update="xunit" Version="2.4.1" />
40-
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
41+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
4142
</ItemGroup>
4243

4344
</Project>

‎tests/ImageSharp.Tests/Formats/Bmp/BmpDecoderTests.cs‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,32 @@ public class BmpDecoderTests
3939
};
4040

4141
[Theory]
42-
[WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32, false)]
43-
[WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32, true)]
44-
public void BmpDecoder_CanDecode_MiscellaneousBitmaps<TPixel>(TestImageProvider<TPixel> provider, bool enforceDiscontiguousBuffers)
42+
[WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32)]
43+
public void BmpDecoder_CanDecode_MiscellaneousBitmaps<TPixel>(TestImageProvider<TPixel> provider)
4544
where TPixel : unmanaged, IPixel<TPixel>
45+
{
46+
using Image<TPixel> image = provider.GetImage(BmpDecoder);
47+
image.DebugSave(provider);
48+
49+
if (TestEnvironment.IsWindows)
50+
{
51+
image.CompareToOriginal(provider);
52+
}
53+
}
54+
55+
[Theory]
56+
[WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32)]
57+
public void BmpDecoder_CanDecode_MiscellaneousBitmaps_WithLimitedAllocatorBufferCapacity(
58+
TestImageProvider<Rgba32> provider)
4659
{
4760
static void RunTest(string providerDump, string nonContiguousBuffersStr)
4861
{
49-
TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
62+
TestImageProvider<Rgba32> provider = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
5063

51-
if (!string.IsNullOrEmpty(nonContiguousBuffersStr))
52-
{
53-
provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
54-
}
64+
provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
5565

56-
using Image<TPixel> image = provider.GetImage(BmpDecoder);
57-
image.DebugSave(provider, testOutputDetails: nonContiguousBuffersStr);
66+
using Image<Rgba32> image = provider.GetImage(BmpDecoder);
67+
image.DebugSave(provider, nonContiguousBuffersStr);
5868

5969
if (TestEnvironment.IsWindows)
6070
{
@@ -66,7 +76,7 @@ static void RunTest(string providerDump, string nonContiguousBuffersStr)
6676
RemoteExecutor.Invoke(
6777
RunTest,
6878
providerDump,
69-
enforceDiscontiguousBuffers ? "Disco" : string.Empty)
79+
"Disco")
7080
.Dispose();
7181
}
7282

‎tests/ImageSharp.Tests/Formats/Gif/GifDecoderTests.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -198,17 +198,18 @@ public void GifDecoder_DegenerateMemoryRequest_ShouldTranslateTo_ImageFormatExce
198198
[Theory]
199199
[WithFile(TestImages.Gif.Giphy, PixelTypes.Rgba32)]
200200
[WithFile(TestImages.Gif.Kumin, PixelTypes.Rgba32)]
201-
public void GifDecoder_CanDecode_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
202-
where TPixel : unmanaged, IPixel<TPixel>
201+
public void GifDecoder_CanDecode_WithLimitedAllocatorBufferCapacity(
202+
TestImageProvider<Rgba32> provider)
203203
{
204204
static void RunTest(string providerDump, string nonContiguousBuffersStr)
205205
{
206-
TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
206+
TestImageProvider<Rgba32> provider
207+
= BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
207208

208209
provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
209210

210-
using Image<TPixel> image = provider.GetImage(GifDecoder);
211-
image.DebugSave(provider);
211+
using Image<Rgba32> image = provider.GetImage(GifDecoder);
212+
image.DebugSave(provider, nonContiguousBuffersStr);
212213
image.CompareToOriginal(provider);
213214
}
214215

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.Progressive.cs‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,32 @@ public partial class JpegDecoderTests
1414
public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg";
1515

1616
[Theory]
17-
[WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32, false)]
18-
[WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32, true)]
19-
public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider, bool enforceDiscontiguousBuffers)
17+
[WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
18+
public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider)
2019
where TPixel : unmanaged, IPixel<TPixel>
20+
{
21+
using Image<TPixel> image = provider.GetImage(JpegDecoder);
22+
image.DebugSave(provider);
23+
24+
provider.Utility.TestName = DecodeProgressiveJpegOutputName;
25+
image.CompareToReferenceOutput(
26+
GetImageComparer(provider),
27+
provider,
28+
appendPixelTypeToFileName: false);
29+
}
30+
31+
[Theory]
32+
[WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32)]
33+
public void DecodeProgressiveJpeg_WithLimitedAllocatorBufferCapacity(TestImageProvider<Rgba32> provider)
2134
{
2235
static void RunTest(string providerDump, string nonContiguousBuffersStr)
2336
{
24-
TestImageProvider<TPixel> provider =
25-
BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
37+
TestImageProvider<Rgba32> provider =
38+
BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
2639

27-
if (!string.IsNullOrEmpty(nonContiguousBuffersStr))
28-
{
29-
provider.LimitAllocatorBufferCapacity().InBytesSqrt(200);
30-
}
40+
provider.LimitAllocatorBufferCapacity().InBytesSqrt(200);
3141

32-
using Image<TPixel> image = provider.GetImage(JpegDecoder);
42+
using Image<Rgba32> image = provider.GetImage(JpegDecoder);
3343
image.DebugSave(provider, nonContiguousBuffersStr);
3444

3545
provider.Utility.TestName = DecodeProgressiveJpegOutputName;
@@ -44,8 +54,8 @@ static void RunTest(string providerDump, string nonContiguousBuffersStr)
4454
RemoteExecutor.Invoke(
4555
RunTest,
4656
providerDump,
47-
enforceDiscontiguousBuffers ? "Disco" : string.Empty)
48-
.Dispose();
57+
"Disco")
58+
.Dispose();
4959
}
5060
}
5161
}

‎tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,10 @@ public async Task DecodeAsnc_DegenerateMemoryRequest_ShouldTranslateTo_ImageForm
129129
[Theory]
130130
[InlineData(TestImages.Jpeg.Baseline.Jpeg420Small, 0)]
131131
[InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 1)]
132-
[InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 10)]
132+
[InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 15)]
133133
[InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 30)]
134134
[InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 1)]
135-
[InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 10)]
135+
[InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 15)]
136136
[InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 30)]
137137
public async Task Decode_IsCancellable(string fileName, int cancellationDelayMs)
138138
{

‎tests/ImageSharp.Tests/Formats/Png/PngDecoderTests.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -404,16 +404,15 @@ public void PngDecoder_DegenerateMemoryRequest_ShouldTranslateTo_ImageFormatExce
404404
[Theory]
405405
[WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
406406
[WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)]
407-
public void PngDecoder_CanDecode_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
408-
where TPixel : unmanaged, IPixel<TPixel>
407+
public void PngDecoder_CanDecode_WithLimitedAllocatorBufferCapacity(TestImageProvider<Rgba32> provider)
409408
{
410409
static void RunTest(string providerDump, string nonContiguousBuffersStr)
411410
{
412-
TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
411+
TestImageProvider<Rgba32> provider = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
413412

414413
provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
415414

416-
using Image<TPixel> image = provider.GetImage(PngDecoder);
415+
using Image<Rgba32> image = provider.GetImage(PngDecoder);
417416
image.DebugSave(provider, testOutputDetails: nonContiguousBuffersStr);
418417
image.CompareToOriginal(provider);
419418
}

0 commit comments

Comments
 (0)