Merge pull request #1378 from SixLabors/js/update-dependencies

Update Dependencies

.runsettings

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+    <RunConfiguration>
+        <!--Used in conjunction with ActiveIssueAttribute to skip tests with known issues-->
+        <TestCaseFilter>category!=failing</TestCaseFilter>
+    </RunConfiguration>
+</RunSettings>

Directory.Build.props

@@ -15,6 +15,7 @@
     <BaseArtifactsPath>$(MSBuildThisFileDirectory)artifacts/</BaseArtifactsPath>
     <BaseArtifactsPathSuffix>$(SixLaborsProjectCategory)/$(MSBuildProjectName)</BaseArtifactsPathSuffix>
     <RepositoryUrl Condition="'$(RepositoryUrl)' == ''">https://github.com/SixLabors/ImageSharp/</RepositoryUrl>
+    <RunSettingsFilePath>$(MSBuildThisFileDirectory)/.runsettings</RunSettingsFilePath>
   </PropertyGroup>
 
   <!-- Default settings that explicitly differ from the Sdk.props defaults  -->

Directory.Build.targets

@@ -18,22 +18,18 @@
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
     <!--Global Dependencies-->
-    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.3.1" />
+    <PackageReference Update="Microsoft.Net.Compilers.Toolset" PrivateAssets="All" Version="3.7.0" />
     <PackageReference Update="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.0" />
     <PackageReference Update="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
     
     <!--Src Dependencies-->
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
-    <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.0" />
+    <PackageReference Update="MinVer" PrivateAssets="All" Version="2.3.1" />
     <PackageReference Update="System.Buffers" Version="4.5.1" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
     <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
-    <!--
+    <PackageReference Update="System.Memory" Version="4.5.4" />
-    Do no update System.Memory as it currently breaks the CI build
-    with FileNotFoundException for SixLabors.ImageSharp.Tests.dll.config
-    -->
-    <PackageReference Update="System.Memory" Version="4.5.3" />
     <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Version="4.7.1" />
     <PackageReference Update="System.Threading.Tasks.Parallel" Version="4.3.0" />
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />

ImageSharp.sln

@@ -9,6 +9,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
 		.gitmodules = .gitmodules
+		.runsettings = .runsettings
 		ci-build.ps1 = ci-build.ps1
 		ci-pack.ps1 = ci-pack.ps1
 		ci-test.ps1 = ci-test.ps1

tests/Directory.Build.targets

@@ -30,14 +30,15 @@
     <PackageReference Update="Colourful" Version="2.0.5" />
     <PackageReference Update="coverlet.collector" Version="1.3.1-preview.27.gdd2237a3be" PrivateAssets="All"/>
     <PackageReference Update="Magick.NET-Q16-AnyCPU" Version="7.22.0" />
-    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20069.1" />
+    <PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20513.1" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20513.1" />
-    <PackageReference Update="Moq" Version="4.14.5" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Update="Moq" Version="4.14.6" />
     <PackageReference Update="Pfim" Version="0.9.1" />
-    <PackageReference Update="SharpZipLib" Version="1.2.0" />
+    <PackageReference Update="SharpZipLib" Version="1.3.0" />
     <PackageReference Update="System.Drawing.Common" Version="4.7.0" />
     <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
   </ItemGroup>
 
 </Project>

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

@@ -39,22 +39,32 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
         };
 
         [Theory]
-        [WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32, false)]
+        [WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32)]
-        [WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32, true)]
+        public void BmpDecoder_CanDecode_MiscellaneousBitmaps<TPixel>(TestImageProvider<TPixel> provider)
-        public void BmpDecoder_CanDecode_MiscellaneousBitmaps<TPixel>(TestImageProvider<TPixel> provider, bool enforceDiscontiguousBuffers)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            static void RunTest(string providerDump, string nonContiguousBuffersStr)
+            using Image<TPixel> image = provider.GetImage(BmpDecoder);
+            image.DebugSave(provider);
+
+            if (TestEnvironment.IsWindows)
             {
-                TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                image.CompareToOriginal(provider);
+            }
+        }
 
-                if (!string.IsNullOrEmpty(nonContiguousBuffersStr))
+        [Theory]
+        [WithFileCollection(nameof(MiscBmpFiles), PixelTypes.Rgba32)]
+        public void BmpDecoder_CanDecode_MiscellaneousBitmaps_WithLimitedAllocatorBufferCapacity(
+            TestImageProvider<Rgba32> provider)
+        {
+            static void RunTest(string providerDump, string nonContiguousBuffersStr)
             {
+                TestImageProvider<Rgba32> provider = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
+
                 provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
-                }
 
-                using Image<TPixel> image = provider.GetImage(BmpDecoder);
+                using Image<Rgba32> image = provider.GetImage(BmpDecoder);
-                image.DebugSave(provider, testOutputDetails: nonContiguousBuffersStr);
+                image.DebugSave(provider, nonContiguousBuffersStr);
 
                 if (TestEnvironment.IsWindows)
                 {
@@ -66,7 +76,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Bmp
             RemoteExecutor.Invoke(
                     RunTest,
                     providerDump,
-                    enforceDiscontiguousBuffers ? "Disco" : string.Empty)
+                    "Disco")
                 .Dispose();
         }
 

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

@@ -198,17 +198,18 @@ namespace SixLabors.ImageSharp.Tests.Formats.Gif
         [Theory]
         [WithFile(TestImages.Gif.Giphy, PixelTypes.Rgba32)]
         [WithFile(TestImages.Gif.Kumin, PixelTypes.Rgba32)]
-        public void GifDecoder_CanDecode_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
+        public void GifDecoder_CanDecode_WithLimitedAllocatorBufferCapacity(
-            where TPixel : unmanaged, IPixel<TPixel>
+            TestImageProvider<Rgba32> provider)
         {
             static void RunTest(string providerDump, string nonContiguousBuffersStr)
             {
-                TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                TestImageProvider<Rgba32> provider
+                    = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
 
                 provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
 
-                using Image<TPixel> image = provider.GetImage(GifDecoder);
+                using Image<Rgba32> image = provider.GetImage(GifDecoder);
-                image.DebugSave(provider);
+                image.DebugSave(provider, nonContiguousBuffersStr);
                 image.CompareToOriginal(provider);
             }
 

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

@@ -14,22 +14,32 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         public const string DecodeProgressiveJpegOutputName = "DecodeProgressiveJpeg";
 
         [Theory]
-        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32, false)]
+        [WithFileCollection(nameof(ProgressiveTestJpegs), PixelTypes.Rgba32)]
-        [WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32, true)]
+        public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider)
-        public void DecodeProgressiveJpeg<TPixel>(TestImageProvider<TPixel> provider, bool enforceDiscontiguousBuffers)
             where TPixel : unmanaged, IPixel<TPixel>
+        {
+            using Image<TPixel> image = provider.GetImage(JpegDecoder);
+            image.DebugSave(provider);
+
+            provider.Utility.TestName = DecodeProgressiveJpegOutputName;
+            image.CompareToReferenceOutput(
+                GetImageComparer(provider),
+                provider,
+                appendPixelTypeToFileName: false);
+        }
+
+        [Theory]
+        [WithFile(TestImages.Jpeg.Progressive.Progress, PixelTypes.Rgba32)]
+        public void DecodeProgressiveJpeg_WithLimitedAllocatorBufferCapacity(TestImageProvider<Rgba32> provider)
         {
             static void RunTest(string providerDump, string nonContiguousBuffersStr)
             {
-                TestImageProvider<TPixel> provider =
+                TestImageProvider<Rgba32> provider =
-                    BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                    BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
 
-                if (!string.IsNullOrEmpty(nonContiguousBuffersStr))
-                {
                 provider.LimitAllocatorBufferCapacity().InBytesSqrt(200);
-                }
 
-                using Image<TPixel> image = provider.GetImage(JpegDecoder);
+                using Image<Rgba32> image = provider.GetImage(JpegDecoder);
                 image.DebugSave(provider, nonContiguousBuffersStr);
 
                 provider.Utility.TestName = DecodeProgressiveJpegOutputName;
@@ -44,7 +54,7 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
             RemoteExecutor.Invoke(
                 RunTest,
                 providerDump,
-                enforceDiscontiguousBuffers ? "Disco" : string.Empty)
+                    "Disco")
                     .Dispose();
         }
     }

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

@@ -129,10 +129,10 @@ namespace SixLabors.ImageSharp.Tests.Formats.Jpg
         [Theory]
         [InlineData(TestImages.Jpeg.Baseline.Jpeg420Small, 0)]
         [InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 1)]
-        [InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 10)]
+        [InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 15)]
         [InlineData(TestImages.Jpeg.Issues.ExifGetString750Transform, 30)]
         [InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 1)]
-        [InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 10)]
+        [InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 15)]
         [InlineData(TestImages.Jpeg.Issues.BadRstProgressive518, 30)]
         public async Task Decode_IsCancellable(string fileName, int cancellationDelayMs)
         {

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

@@ -404,16 +404,15 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
         [Theory]
         [WithFile(TestImages.Png.Splash, PixelTypes.Rgba32)]
         [WithFile(TestImages.Png.Bike, PixelTypes.Rgba32)]
-        public void PngDecoder_CanDecode_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
+        public void PngDecoder_CanDecode_WithLimitedAllocatorBufferCapacity(TestImageProvider<Rgba32> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
         {
             static void RunTest(string providerDump, string nonContiguousBuffersStr)
             {
-                TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                TestImageProvider<Rgba32> provider = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
 
                 provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
 
-                using Image<TPixel> image = provider.GetImage(PngDecoder);
+                using Image<Rgba32> image = provider.GetImage(PngDecoder);
                 image.DebugSave(provider, testOutputDetails: nonContiguousBuffersStr);
                 image.CompareToOriginal(provider);
             }

tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs

@@ -536,13 +536,12 @@ namespace SixLabors.ImageSharp.Tests.Formats.Png
 
         [Theory]
         [WithTestPatternImages(100, 100, PixelTypes.Rgba32)]
-        public void EncodeWorksWithoutSsse3Intrinsics<TPixel>(TestImageProvider<TPixel> provider)
+        public void EncodeWorksWithoutSsse3Intrinsics(TestImageProvider<Rgba32> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
         {
             static void RunTest(string providerDump)
             {
-                TestImageProvider<TPixel> provider =
+                TestImageProvider<Rgba32> provider =
-                    BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                    BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
 #if SUPPORTS_RUNTIME_INTRINSICS
                 Assert.False(Ssse3.IsSupported);
 #endif

tests/ImageSharp.Tests/Formats/Tga/TgaDecoderTests.cs

@@ -747,16 +747,15 @@ namespace SixLabors.ImageSharp.Tests.Formats.Tga
         [Theory]
         [WithFile(Bit24BottomLeft, PixelTypes.Rgba32)]
         [WithFile(Bit32BottomLeft, PixelTypes.Rgba32)]
-        public void TgaDecoder_CanDecode_WithLimitedAllocatorBufferCapacity<TPixel>(TestImageProvider<TPixel> provider)
+        public void TgaDecoder_CanDecode_WithLimitedAllocatorBufferCapacity(TestImageProvider<Rgba32> provider)
-            where TPixel : unmanaged, IPixel<TPixel>
         {
             static void RunTest(string providerDump, string nonContiguousBuffersStr)
             {
-                TestImageProvider<TPixel> provider = BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
+                TestImageProvider<Rgba32> provider = BasicSerializer.Deserialize<TestImageProvider<Rgba32>>(providerDump);
 
                 provider.LimitAllocatorBufferCapacity().InPixelsSqrt(100);
 
-                using Image<TPixel> image = provider.GetImage(TgaDecoder);
+                using Image<Rgba32> image = provider.GetImage(TgaDecoder);
                 image.DebugSave(provider, testOutputDetails: nonContiguousBuffersStr);
 
                 if (TestEnvironment.IsWindows)

tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@@ -20,6 +20,7 @@
   <ItemGroup>
     <PackageReference Include="Magick.NET-Q16-AnyCPU" />
     <PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
+    <PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
     <PackageReference Include="Moq" />
     <PackageReference Include="SharpZipLib" />
     <PackageReference Include="System.Drawing.Common" />

tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs

@@ -138,23 +138,12 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
         public void BokehBlurFilterProcessor<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            static void RunTest(string providerDump, string infoDump)
-            {
-                TestImageProvider<TPixel> provider =
-                    BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
-                BokehBlurInfo value = BasicSerializer.Deserialize<BokehBlurInfo>(infoDump);
-
             provider.RunValidatingProcessorTest(
                 x => x.BokehBlur(value.Radius, value.Components, value.Gamma),
                 testOutputDetails: value.ToString(),
                 appendPixelTypeToFileName: false);
         }
 
-            RemoteExecutor
-                .Invoke(RunTest, BasicSerializer.Serialize(provider), BasicSerializer.Serialize(value))
-                .Dispose();
-        }
-
         [Theory]
         /*
          TODO: Re-enable L8 when we update the reference images.
@@ -164,31 +153,16 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
         public void BokehBlurFilterProcessor_WorksWithAllPixelTypes<TPixel>(TestImageProvider<TPixel> provider)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            static void RunTest(string providerDump)
-            {
-                TestImageProvider<TPixel> provider =
-                    BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
             provider.RunValidatingProcessorTest(
                     x => x.BokehBlur(8, 2, 3),
                     appendSourceFileOrDescription: false);
         }
 
-            RemoteExecutor
-                .Invoke(RunTest, BasicSerializer.Serialize(provider))
-                .Dispose();
-        }
-
         [Theory]
         [WithFileCollection(nameof(TestFiles), nameof(BokehBlurValues), PixelTypes.Rgba32)]
         public void BokehBlurFilterProcessor_Bounded<TPixel>(TestImageProvider<TPixel> provider, BokehBlurInfo value)
             where TPixel : unmanaged, IPixel<TPixel>
         {
-            static void RunTest(string providerDump, string infoDump)
-            {
-                TestImageProvider<TPixel> provider =
-                    BasicSerializer.Deserialize<TestImageProvider<TPixel>>(providerDump);
-                BokehBlurInfo value = BasicSerializer.Deserialize<BokehBlurInfo>(infoDump);
-
             provider.RunValidatingProcessorTest(
                 x =>
                 {
@@ -200,11 +174,6 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution
                 appendPixelTypeToFileName: false);
         }
 
-            RemoteExecutor
-                .Invoke(RunTest, BasicSerializer.Serialize(provider), BasicSerializer.Serialize(value))
-                .Dispose();
-        }
-
         [Theory]
         [WithTestPatternImages(100, 300, PixelTypes.Bgr24)]
         public void WorksWithDiscoBuffers<TPixel>(TestImageProvider<TPixel> provider)

tests/ImageSharp.Tests/TestUtilities/TestEnvironment.cs

@@ -170,7 +170,10 @@ namespace SixLabors.ImageSharp.Tests
             }
 
             string testProjectConfigPath = TestAssemblyFile.FullName + ".config";
+            if (File.Exists(testProjectConfigPath))
+            {
                 File.Copy(testProjectConfigPath, remoteExecutorConfigPath);
+            }
 
             if (Is64BitProcess)
             {

tests/coverlet.runsettings

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <RunSettings>
+    <RunConfiguration>
+        <!--Used in conjunction with ActiveIssueAttribute to skip tests with known issues-->
+        <TestCaseFilter>category!=failing</TestCaseFilter>
+    </RunConfiguration>
     <DataCollectionRunSettings>
         <DataCollectors>
             <DataCollector friendlyName="XPlat code coverage">