From d5568e7271eaf5a6bbfe7d6c4f2cb549473e5897 Mon Sep 17 00:00:00 2001 From: MoonsvnLyn <287222957+FirmaSpring@users.noreply.github.com> Date: Mon, 17 Aug 2026 17:27:54 +0800 Subject: [PATCH 01/10] docs: point samples link at SixLabors.Samples.ImageSharp The README linked to github.com/SixLabors/Samples/tree/main/ImageSharp, which returns GET 404. The samples now live in SixLabors.Samples.ImageSharp on the same repo. Co-authored-by: FirmamentalSpring <287222957+FirmaSpring@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4d4375dbf..17b8d409d 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Support the efforts of the development of the Six Labors projects. ## Documentation - [Detailed documentation](https://sixlabors.github.io/docs/) for the ImageSharp API is available. This includes additional conceptual documentation to help you get started. -- Our [Samples Repository](https://github.com/SixLabors/Samples/tree/main/ImageSharp) is also available containing buildable code samples demonstrating common activities. +- Our [Samples Repository](https://github.com/SixLabors/Samples/tree/main/SixLabors.Samples.ImageSharp) is also available containing buildable code samples demonstrating common activities. ## Questions From 31b62b1aa73333d5d872679ade846d81027d77e5 Mon Sep 17 00:00:00 2001 From: MoonsvnLyn <287222957+FirmaSpring@users.noreply.github.com> Date: Mon, 17 Aug 2026 17:29:11 +0800 Subject: [PATCH 02/10] docs: drop copied Robidoux Sharp comment from Spline CubicResampler.Spline had a second XML summary copied from RobidouxSharp. The field is the B-spline (B=1, C=0) kernel, so only the spline summary should remain. Co-authored-by: FirmamentalSpring <287222957+FirmaSpring@users.noreply.github.com> --- .../Processors/Transforms/Resamplers/CubicResampler.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs index 41228e411..1add8160a 100644 --- a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs +++ b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs @@ -53,10 +53,6 @@ public readonly struct CubicResampler : IResampler /// The function implements the spline algorithm. /// /// - /// - /// The function implements the Robidoux Sharp algorithm. - /// - /// public static readonly CubicResampler Spline = new(2, 1, 0); /// From 22323d891396a5020b91c306a3dc203efaf3f7e2 Mon Sep 17 00:00:00 2001 From: MoonsvnLyn <287222957+FirmaSpring@users.noreply.github.com> Date: Mon, 17 Aug 2026 17:30:15 +0800 Subject: [PATCH 03/10] docs: update ImageMagick Usage filter links in resamplers ## Problem Cubic and Welch resampler XML docs still cite the retired ImageMagick Usage host: http://www.imagemagick.org/Usage/filter/ GET with redirects returns 404. The same pages now live at https://usage.imagemagick.org/filter/. ## Solution Update the `see` hrefs in `CubicResampler` and `WelchResampler` to the current Usage site, keeping the original `#cubic_bc` and `#robidoux` fragments. ## Verification ``` curl -sL -o /dev/null -w "%{http_code}" -A "Mozilla/5.0" \ "http://www.imagemagick.org/Usage/filter/" # 404 curl -sL -o /dev/null -w "%{http_code}" -A "Mozilla/5.0" \ "https://usage.imagemagick.org/filter/" # 200 curl -sL -o /dev/null -w "%{http_code}" -A "Mozilla/5.0" \ "https://usage.imagemagick.org/filter/#cubic_bc" # 200 curl -sL -o /dev/null -w "%{http_code}" -A "Mozilla/5.0" \ "https://usage.imagemagick.org/filter/#robidoux" # 200 ``` Co-authored-by: FirmamentalSpring <287222957+FirmaSpring@users.noreply.github.com> --- .../Processors/Transforms/Resamplers/CubicResampler.cs | 10 +++++----- .../Processors/Transforms/Resamplers/WelchResampler.cs | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs index 41228e411..4807b573e 100644 --- a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs +++ b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/CubicResampler.cs @@ -10,7 +10,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms; /// Cubic filters contain a collection of different filters of varying B-Spline and /// Cardinal values. With these two values you can generate any smoothly fitting /// (continuious first derivative) piece-wise cubic filter. -/// +/// /// /// public readonly struct CubicResampler : IResampler @@ -39,23 +39,23 @@ public readonly struct CubicResampler : IResampler /// /// The function implements the Robidoux algorithm. - /// + /// /// public static readonly CubicResampler Robidoux = new(2, .37821575509399867F, .31089212245300067F); /// /// The function implements the Robidoux Sharp algorithm. - /// + /// /// public static readonly CubicResampler RobidouxSharp = new(2, .2620145123990142F, .3689927438004929F); /// /// The function implements the spline algorithm. - /// + /// /// /// /// The function implements the Robidoux Sharp algorithm. - /// + /// /// public static readonly CubicResampler Spline = new(2, 1, 0); diff --git a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/WelchResampler.cs b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/WelchResampler.cs index de0fe3f80..b866dbb01 100644 --- a/src/ImageSharp/Processing/Processors/Transforms/Resamplers/WelchResampler.cs +++ b/src/ImageSharp/Processing/Processors/Transforms/Resamplers/WelchResampler.cs @@ -8,7 +8,7 @@ namespace SixLabors.ImageSharp.Processing.Processors.Transforms; /// /// The function implements the welch algorithm. -/// +/// /// public readonly struct WelchResampler : IResampler { From c5aae967547de63e9c5ea7c382c9966138dd6e44 Mon Sep 17 00:00:00 2001 From: MoonsvnLyn <287222957+FirmaSpring@users.noreply.github.com> Date: Mon, 17 Aug 2026 17:30:27 +0800 Subject: [PATCH 04/10] docs: fix RapidTables HSL conversion reference URL ## Problem The HSL conversion test cites RapidTables without a file extension: http://www.rapidtables.com/convert/color/hsl-to-rgb GET with redirects returns 404. The live page is `/hsl-to-rgb.html`. ## Solution Update the `see` href to the current RapidTables URL. ## Verification ``` curl -sL -o /dev/null -w "%{http_code} %{url_effective}" -A "Mozilla/5.0" \ "http://www.rapidtables.com/convert/color/hsl-to-rgb" # 404 https://www.rapidtables.com/convert/color/hsl-to-rgb curl -sL -o /dev/null -w "%{http_code} %{url_effective}" -A "Mozilla/5.0" \ "https://www.rapidtables.com/convert/color/hsl-to-rgb.html" # 200 https://www.rapidtables.com/convert/color/hsl-to-rgb.html ``` Co-authored-by: FirmamentalSpring <287222957+FirmaSpring@users.noreply.github.com> --- tests/ImageSharp.Tests/ColorProfiles/RgbAndHslConversionTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/ImageSharp.Tests/ColorProfiles/RgbAndHslConversionTest.cs b/tests/ImageSharp.Tests/ColorProfiles/RgbAndHslConversionTest.cs index e5874c3d1..7ec72a36e 100644 --- a/tests/ImageSharp.Tests/ColorProfiles/RgbAndHslConversionTest.cs +++ b/tests/ImageSharp.Tests/ColorProfiles/RgbAndHslConversionTest.cs @@ -11,7 +11,7 @@ namespace SixLabors.ImageSharp.Tests.ColorProfiles; /// /// Test data generated using: /// -/// +/// /// [Trait("Color", "Conversion")] public class RgbAndHslConversionTest From f381e0ed517bc8466625dba82e10f0b31ecbe645 Mon Sep 17 00:00:00 2001 From: MoonsvnLyn <287222957+FirmaSpring@users.noreply.github.com> Date: Mon, 17 Aug 2026 17:51:33 +0800 Subject: [PATCH 05/10] docs: replace dead Adobe TIFF spec links with libtiff mirrors The partners.adobe.com links for the TIFF 6.0 specification and Supplements 1 and 2 GET 404. Replace them with the equivalent PDFs hosted by download.osgeo.org (libtiff project), verified 200. Co-authored-by: FirmamentalSpring <287222957+FirmaSpring@users.noreply.github.com> --- src/ImageSharp/Formats/Tiff/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ImageSharp/Formats/Tiff/README.md b/src/ImageSharp/Formats/Tiff/README.md index 48cbd54ca..8e49669f2 100644 --- a/src/ImageSharp/Formats/Tiff/README.md +++ b/src/ImageSharp/Formats/Tiff/README.md @@ -2,9 +2,9 @@ ## References - TIFF - - [TIFF 6.0 Specification](http://partners.adobe.com/public/developer/en/tiff/TIFF6.pdf),(http://www.npes.org/pdf/TIFF-v6.pdf) - - [TIFF Supplement 1](http://partners.adobe.com/public/developer/en/tiff/TIFFPM6.pdf) - - [TIFF Supplement 2](http://partners.adobe.com/public/developer/en/tiff/TIFFphotoshop.pdf) + - [TIFF 6.0 Specification](https://download.osgeo.org/libtiff/doc/TIFF6.pdf) + - [TIFF Supplement 1](https://download.osgeo.org/libtiff/doc/TIFFPM6.pdf) + - [TIFF Supplement 2](https://download.osgeo.org/libtiff/doc/TIFFphotoshop.pdf) - [TIFF Supplement 3](http://chriscox.org/TIFFTN3d1.pdf) - [TIFF-F/FX Extension (RFC2301)](http://www.ietf.org/rfc/rfc2301.txt) - [TIFF/EP Extension (Wikipedia)](https://en.wikipedia.org/wiki/TIFF/EP) From 8930d4fd6fcf52a064ee23204f189f60a2dd0948 Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Wed, 19 Aug 2026 08:53:22 +0200 Subject: [PATCH 06/10] Migrate to xUnitV3 --- shared-infrastructure | 2 +- tests/Directory.Build.targets | 1 - .../Program.cs | 8 +- .../Icc/ColorProfileConverterTests.Icc.cs | 1 - .../ImageSharp.Tests/Common/NumericsTests.cs | 2 - .../ImageSharp.Tests/Common/SimdUtilsTests.cs | 1 - .../Formats/Jpg/Block8x8FTests.cs | 1 - .../Formats/Jpg/Block8x8Tests.cs | 1 - .../ImageSharp.Tests/Formats/Jpg/DCTTests.cs | 1 - .../Formats/Jpg/HuffmanScanEncoderTests.cs | 1 - .../Formats/Jpg/JpegDecoderTests.cs | 1 - .../Formats/Jpg/ParseStreamTests.cs | 1 - ...ferenceImplementationsTests.AccurateDCT.cs | 1 - ...plementationsTests.FastFloatingPointDCT.cs | 1 - ...ImplementationsTests.StandardIntegerDCT.cs | 1 - .../Jpg/ReferenceImplementationsTests.cs | 2 - .../Formats/Jpg/SpectralJpegTests.cs | 1 - .../Jpg/SpectralToPixelConversionTests.cs | 1 - .../Formats/Jpg/Utils/JpegFixture.cs | 1 - ...ceImplementations.LLM_FloatingPoint_DCT.cs | 2 - .../Formats/Jpg/Utils/VerifyJpeg.cs | 1 - .../Formats/Png/PngEncoderFilterTests.cs | 1 - .../Formats/Png/PngEncoderTests.cs | 8 +- .../Helpers/ParallelRowIteratorTests.cs | 1 - .../Image/ImageTests.Decode_Cancellation.cs | 1 + .../ImageSharp.Tests/ImageSharp.Tests.csproj | 1 - .../UniformUnmanagedMemoryPoolTests.cs | 2 +- .../Profiles/Exif/Values/ExifValuesTests.cs | 502 +++++++++--------- .../ImageSharp.Tests/PixelFormats/L8Tests.cs | 6 +- .../PixelFormats/La16Tests.cs | 6 +- ...elOperationsTests.Specialized.Generated.cs | 3 +- .../Generated/_Common.ttinclude | 1 - .../PixelOperations/PixelOperationsTests.cs | 82 +-- .../Processors/Convolution/BokehBlurTest.cs | 2 +- .../Processors/Dithering/DitherTests.cs | 4 +- .../Processors/Quantization/QuantizerTests.cs | 118 ++-- .../Transforms/AffineTransformTests.cs | 1 - .../Transforms/ProjectiveTransformTests.cs | 1 - .../Transforms/ResizeKernelMapTests.cs | 1 - .../Processors/Transforms/RotateTests.cs | 12 +- .../LoadResizeSaveProfilingBenchmarks.cs | 1 - .../ResizeProfilingBenchmarks.cs | 1 - .../AlphaAssociationQuantizerTests.cs | 2 +- .../Attributes/ImageDataAttributeBase.cs | 33 +- .../TestUtilities/BasicSerializer.cs | 30 +- .../FeatureTesting/FeatureTestRunner.cs | 2 +- .../BasicTestPatternProvider.cs | 2 +- .../ImageProviders/BlankProvider.cs | 3 +- .../ImageProviders/FileProvider.cs | 3 +- .../ImageProviders/MemberMethodProvider.cs | 2 +- .../ImageProviders/SolidProvider.cs | 2 +- .../ImageProviders/TestImageProvider.cs | 3 +- .../ImageProviders/TestPatternProvider.cs | 2 +- .../TestUtilities/MeasureFixture.cs | 1 - .../SixLaborsXunitTestFramework.cs | 15 +- .../TestUtilities/TestPixel.cs | 2 +- .../TestUtilities/TestType.cs | 2 +- .../TestUtilities/TestVector4.cs | 2 +- .../Tests/BasicSerializerTests.cs | 24 +- .../Tests/FeatureTestRunnerTests.cs | 2 +- .../TestUtilities/Tests/ImageComparerTests.cs | 1 - .../Tests/MagickReferenceCodecTests.cs | 1 - .../Tests/ReferenceDecoderBenchmarks.cs | 1 - .../Tests/SystemDrawingReferenceCodecTests.cs | 1 - .../Tests/TestEnvironmentTests.cs | 1 - .../Tests/TestImageProviderTests.cs | 23 +- .../Tests/TestUtilityExtensionsTests.cs | 1 - .../XUnit/ConditionalDiscovererException.cs | 12 + .../TestUtilities/XUnit/ConditionalFact.cs | 35 ++ .../XUnit/ConditionalTestDiscoverer.cs | 154 ++++++ .../TestUtilities/XUnit/ConditionalTheory.cs | 33 ++ .../XUnit/StaticReflectionConstants.cs | 15 + ...idateDisposedMemoryAllocationsAttribute.cs | 6 +- 73 files changed, 723 insertions(+), 480 deletions(-) create mode 100644 tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalDiscovererException.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalFact.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTestDiscoverer.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTheory.cs create mode 100644 tests/ImageSharp.Tests/TestUtilities/XUnit/StaticReflectionConstants.cs diff --git a/shared-infrastructure b/shared-infrastructure index 20f15a2d4..131fe3e59 160000 --- a/shared-infrastructure +++ b/shared-infrastructure @@ -1 +1 @@ -Subproject commit 20f15a2d47bba9d8375b5fd34fac283336ec9a5e +Subproject commit 131fe3e59db92847b3d2bc8937bd35804dbcc8d5 diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index da57541fa..567f8d489 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -25,7 +25,6 @@ --> - diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs b/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs index db8892cd7..96eb86793 100644 --- a/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs +++ b/tests/ImageSharp.Tests.ProfilingSandbox/Program.cs @@ -4,7 +4,7 @@ using SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations; using SixLabors.ImageSharp.Tests.ProfilingBenchmarks; using SixLabors.ImageSharp.Tests.ProfilingSandbox; -using Xunit.Abstractions; +using Xunit; // in this file, comments are used for disabling stuff for local execution #pragma warning disable SA1515 @@ -32,7 +32,13 @@ static void RunToVector4ProfilingTest() sealed class ConsoleOutput : ITestOutputHelper { + public void Write(string message) => Console.Write(message); + + public void Write(string format, params object[] args) => Console.Write(format, args); + public void WriteLine(string message) => Console.WriteLine(message); public void WriteLine(string format, params object[] args) => Console.WriteLine(format, args); + + public string Output { get; } } diff --git a/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs b/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs index cb349af96..2e5b294a2 100644 --- a/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs +++ b/tests/ImageSharp.Tests/ColorProfiles/Icc/ColorProfileConverterTests.Icc.cs @@ -6,7 +6,6 @@ using SixLabors.ImageSharp.ColorProfiles; using SixLabors.ImageSharp.Metadata.Profiles.Icc; using Wacton.Unicolour; using Wacton.Unicolour.Icc; -using Xunit.Abstractions; using Rgb = SixLabors.ImageSharp.ColorProfiles.Rgb; namespace SixLabors.ImageSharp.Tests.ColorProfiles.Icc; diff --git a/tests/ImageSharp.Tests/Common/NumericsTests.cs b/tests/ImageSharp.Tests/Common/NumericsTests.cs index ebee57060..280522c16 100644 --- a/tests/ImageSharp.Tests/Common/NumericsTests.cs +++ b/tests/ImageSharp.Tests/Common/NumericsTests.cs @@ -1,8 +1,6 @@ // Copyright (c) Six Labors. // Licensed under the Six Labors Split License. -using Xunit.Abstractions; - namespace SixLabors.ImageSharp.Tests.Common; public class NumericsTests diff --git a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs index 71335032c..034ec89d0 100644 --- a/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs +++ b/tests/ImageSharp.Tests/Common/SimdUtilsTests.cs @@ -9,7 +9,6 @@ using System.Runtime.Intrinsics.X86; using SixLabors.ImageSharp.Common.Helpers; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Common; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs index 610693c7f..fe9d5ed6d 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs @@ -7,7 +7,6 @@ using System.Runtime.Intrinsics; using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs index fb1e062f2..c5a24b484 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Block8x8Tests.cs @@ -4,7 +4,6 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs index b17a39f38..b0e35c7b0 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs @@ -4,7 +4,6 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/HuffmanScanEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/HuffmanScanEncoderTests.cs index 36b792fa1..2cc0a961f 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/HuffmanScanEncoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/HuffmanScanEncoderTests.cs @@ -2,7 +2,6 @@ // Licensed under the Six Labors Split License. using SixLabors.ImageSharp.Formats.Jpeg.Components.Encoder; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs index 2f84a1a7b..f3005d124 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/JpegDecoderTests.cs @@ -9,7 +9,6 @@ using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs index b6a59fa93..a14df945a 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ParseStreamTests.cs @@ -6,7 +6,6 @@ using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs index c593a029a..d049472c8 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.AccurateDCT.cs @@ -3,7 +3,6 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs index 2fcd953ae..80b42cce6 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.FastFloatingPointDCT.cs @@ -4,7 +4,6 @@ // ReSharper disable InconsistentNaming using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs index b44734972..b6c5ba1c9 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.StandardIntegerDCT.cs @@ -3,7 +3,6 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs index 2e97b9596..f7968ea6b 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/ReferenceImplementationsTests.cs @@ -1,8 +1,6 @@ // Copyright (c) Six Labors. // Licensed under the Six Labors Split License. -using Xunit.Abstractions; - // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs index 1610df6eb..2028c09a8 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralJpegTests.cs @@ -9,7 +9,6 @@ using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Metadata.Profiles.Icc; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs b/tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs index 13300ee80..14c7aacd5 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/SpectralToPixelConversionTests.cs @@ -7,7 +7,6 @@ using SixLabors.ImageSharp.IO; using SixLabors.ImageSharp.Metadata; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs index 33e95c5aa..57866989a 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/JpegFixture.cs @@ -6,7 +6,6 @@ using System.Text; using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg.Components; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs index 7c7f47f94..35ba1b3c3 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/ReferenceImplementations.LLM_FloatingPoint_DCT.cs @@ -5,8 +5,6 @@ using System.Numerics; using System.Runtime.CompilerServices; using SixLabors.ImageSharp.Formats.Jpeg.Components; -using Xunit.Abstractions; - // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; diff --git a/tests/ImageSharp.Tests/Formats/Jpg/Utils/VerifyJpeg.cs b/tests/ImageSharp.Tests/Formats/Jpg/Utils/VerifyJpeg.cs index 7a31e35d0..4928515a2 100644 --- a/tests/ImageSharp.Tests/Formats/Jpg/Utils/VerifyJpeg.cs +++ b/tests/ImageSharp.Tests/Formats/Jpg/Utils/VerifyJpeg.cs @@ -3,7 +3,6 @@ using SixLabors.ImageSharp.Formats.Jpeg.Components.Decoder; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Jpg.Utils; diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs index 423d54e5f..d9fed19c4 100644 --- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs +++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderFilterTests.cs @@ -6,7 +6,6 @@ using SixLabors.ImageSharp.Formats.Png; using SixLabors.ImageSharp.Formats.Png.Filters; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Formats.Png; diff --git a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs index eef8d5ba8..a60f4bd72 100644 --- a/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs +++ b/tests/ImageSharp.Tests/Formats/Png/PngEncoderTests.cs @@ -200,14 +200,14 @@ public partial class PngEncoderTests return; } - foreach (object[] filterMethod in PngFilterMethods) + foreach (TheoryDataRow filterMethod in PngFilterMethods) { foreach (PngInterlaceMode interlaceMode in InterlaceMode) { TestPngEncoderCore( provider, pngColorType, - (PngFilterMethod)filterMethod[0], + filterMethod.Data, pngBitDepth, interlaceMode, appendPngColorType: true, @@ -236,14 +236,14 @@ public partial class PngEncoderTests public void WorksWithAllBitDepthsAndExcludeAllFilter(TestImageProvider provider, PngColorType pngColorType, PngBitDepth pngBitDepth) where TPixel : unmanaged, IPixel { - foreach (object[] filterMethod in PngFilterMethods) + foreach (TheoryDataRow filterMethod in PngFilterMethods) { foreach (PngInterlaceMode interlaceMode in InterlaceMode) { TestPngEncoderCore( provider, pngColorType, - (PngFilterMethod)filterMethod[0], + filterMethod.Data, pngBitDepth, interlaceMode, appendPngColorType: true, diff --git a/tests/ImageSharp.Tests/Helpers/ParallelRowIteratorTests.cs b/tests/ImageSharp.Tests/Helpers/ParallelRowIteratorTests.cs index 017926fc5..ec9ee571c 100644 --- a/tests/ImageSharp.Tests/Helpers/ParallelRowIteratorTests.cs +++ b/tests/ImageSharp.Tests/Helpers/ParallelRowIteratorTests.cs @@ -7,7 +7,6 @@ using Castle.Core.Configuration; using SixLabors.ImageSharp.Advanced; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Helpers; diff --git a/tests/ImageSharp.Tests/Image/ImageTests.Decode_Cancellation.cs b/tests/ImageSharp.Tests/Image/ImageTests.Decode_Cancellation.cs index 0656f9e0b..0f0b13268 100644 --- a/tests/ImageSharp.Tests/Image/ImageTests.Decode_Cancellation.cs +++ b/tests/ImageSharp.Tests/Image/ImageTests.Decode_Cancellation.cs @@ -3,6 +3,7 @@ using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Tests.TestUtilities; +using XUnit; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj index a1d5b0ee2..25d30b514 100644 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -45,7 +45,6 @@ - diff --git a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs index ec79d91c3..1c91dec12 100644 --- a/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs +++ b/tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.cs @@ -5,7 +5,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using Microsoft.DotNet.RemoteExecutor; using SixLabors.ImageSharp.Memory.Internals; -using Xunit.Abstractions; +using XUnit; namespace SixLabors.ImageSharp.Tests.Memory.Allocators; diff --git a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs index d7d6741ba..94853b91c 100644 --- a/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs +++ b/tests/ImageSharp.Tests/Metadata/Profiles/Exif/Values/ExifValuesTests.cs @@ -11,329 +11,329 @@ public class ExifValuesTests { public static TheoryData ByteTags => new() { - { ExifTag.FaxProfile }, - { ExifTag.ModeNumber }, - { ExifTag.GPSAltitudeRef } + (ExifTag)ExifTag.FaxProfile, + (ExifTag)ExifTag.ModeNumber, + (ExifTag)ExifTag.GPSAltitudeRef }; public static TheoryData ByteArrayTags => new() { - { ExifTag.ClipPath }, - { ExifTag.VersionYear }, - { ExifTag.XMP }, - { ExifTag.CFAPattern2 }, - { ExifTag.TIFFEPStandardID }, - { ExifTag.GPSVersionID }, + (ExifTag)ExifTag.ClipPath, + (ExifTag)ExifTag.VersionYear, + (ExifTag)ExifTag.XMP, + (ExifTag)ExifTag.CFAPattern2, + (ExifTag)ExifTag.TIFFEPStandardID, + (ExifTag)ExifTag.GPSVersionID, }; public static TheoryData DoubleArrayTags => new() { - { ExifTag.PixelScale }, - { ExifTag.IntergraphMatrix }, - { ExifTag.ModelTiePoint }, - { ExifTag.ModelTransform } + (ExifTag)ExifTag.PixelScale, + (ExifTag)ExifTag.IntergraphMatrix, + (ExifTag)ExifTag.ModelTiePoint, + (ExifTag)ExifTag.ModelTransform }; public static TheoryData LongTags => new() { - { ExifTag.SubfileType }, - { ExifTag.SubIFDOffset }, - { ExifTag.GPSIFDOffset }, - { ExifTag.T4Options }, - { ExifTag.T6Options }, - { ExifTag.XClipPathUnits }, - { ExifTag.YClipPathUnits }, - { ExifTag.ProfileType }, - { ExifTag.CodingMethods }, - { ExifTag.T82ptions }, - { ExifTag.JPEGInterchangeFormat }, - { ExifTag.JPEGInterchangeFormatLength }, - { ExifTag.MDFileTag }, - { ExifTag.StandardOutputSensitivity }, - { ExifTag.RecommendedExposureIndex }, - { ExifTag.ISOSpeed }, - { ExifTag.ISOSpeedLatitudeyyy }, - { ExifTag.ISOSpeedLatitudezzz }, - { ExifTag.FaxRecvParams }, - { ExifTag.FaxRecvTime }, - { ExifTag.ImageNumber }, + (ExifTag)ExifTag.SubfileType, + (ExifTag)ExifTag.SubIFDOffset, + (ExifTag)ExifTag.GPSIFDOffset, + (ExifTag)ExifTag.T4Options, + (ExifTag)ExifTag.T6Options, + (ExifTag)ExifTag.XClipPathUnits, + (ExifTag)ExifTag.YClipPathUnits, + (ExifTag)ExifTag.ProfileType, + (ExifTag)ExifTag.CodingMethods, + (ExifTag)ExifTag.T82ptions, + (ExifTag)ExifTag.JPEGInterchangeFormat, + (ExifTag)ExifTag.JPEGInterchangeFormatLength, + (ExifTag)ExifTag.MDFileTag, + (ExifTag)ExifTag.StandardOutputSensitivity, + (ExifTag)ExifTag.RecommendedExposureIndex, + (ExifTag)ExifTag.ISOSpeed, + (ExifTag)ExifTag.ISOSpeedLatitudeyyy, + (ExifTag)ExifTag.ISOSpeedLatitudezzz, + (ExifTag)ExifTag.FaxRecvParams, + (ExifTag)ExifTag.FaxRecvTime, + (ExifTag)ExifTag.ImageNumber, }; public static TheoryData LongArrayTags => new() { - { ExifTag.FreeOffsets }, - { ExifTag.FreeByteCounts }, - { ExifTag.ColorResponseUnit }, - { ExifTag.SMinSampleValue }, - { ExifTag.SMaxSampleValue }, - { ExifTag.JPEGQTables }, - { ExifTag.JPEGDCTables }, - { ExifTag.JPEGACTables }, - { ExifTag.StripRowCounts }, - { ExifTag.IntergraphRegisters } + (ExifTag)ExifTag.FreeOffsets, + (ExifTag)ExifTag.FreeByteCounts, + (ExifTag)ExifTag.ColorResponseUnit, + (ExifTag)ExifTag.SMinSampleValue, + (ExifTag)ExifTag.SMaxSampleValue, + (ExifTag)ExifTag.JPEGQTables, + (ExifTag)ExifTag.JPEGDCTables, + (ExifTag)ExifTag.JPEGACTables, + (ExifTag)ExifTag.StripRowCounts, + (ExifTag)ExifTag.IntergraphRegisters }; public static TheoryData NumberTags => new() { - { ExifTag.ImageWidth }, - { ExifTag.ImageLength }, - { ExifTag.TileWidth }, - { ExifTag.TileLength }, - { ExifTag.BadFaxLines }, - { ExifTag.ConsecutiveBadFaxLines }, - { ExifTag.PixelXDimension }, - { ExifTag.PixelYDimension } + (ExifTag)ExifTag.ImageWidth, + (ExifTag)ExifTag.ImageLength, + (ExifTag)ExifTag.TileWidth, + (ExifTag)ExifTag.TileLength, + (ExifTag)ExifTag.BadFaxLines, + (ExifTag)ExifTag.ConsecutiveBadFaxLines, + (ExifTag)ExifTag.PixelXDimension, + (ExifTag)ExifTag.PixelYDimension }; public static TheoryData NumberArrayTags => new() { - { ExifTag.StripOffsets }, - { ExifTag.StripByteCounts }, - { ExifTag.TileByteCounts }, - { ExifTag.TileOffsets }, - { ExifTag.ImageLayer } + (ExifTag)ExifTag.StripOffsets, + (ExifTag)ExifTag.StripByteCounts, + (ExifTag)ExifTag.TileByteCounts, + (ExifTag)ExifTag.TileOffsets, + (ExifTag)ExifTag.ImageLayer }; public static TheoryData RationalTags => new() { - { ExifTag.XPosition }, - { ExifTag.YPosition }, - { ExifTag.XResolution }, - { ExifTag.YResolution }, - { ExifTag.BatteryLevel }, - { ExifTag.ExposureTime }, - { ExifTag.FNumber }, - { ExifTag.MDScalePixel }, - { ExifTag.CompressedBitsPerPixel }, - { ExifTag.ApertureValue }, - { ExifTag.MaxApertureValue }, - { ExifTag.SubjectDistance }, - { ExifTag.FocalLength }, - { ExifTag.FlashEnergy2 }, - { ExifTag.FocalPlaneXResolution2 }, - { ExifTag.FocalPlaneYResolution2 }, - { ExifTag.ExposureIndex2 }, - { ExifTag.Humidity }, - { ExifTag.Pressure }, - { ExifTag.Acceleration }, - { ExifTag.FlashEnergy }, - { ExifTag.FocalPlaneXResolution }, - { ExifTag.FocalPlaneYResolution }, - { ExifTag.ExposureIndex }, - { ExifTag.DigitalZoomRatio }, - { ExifTag.GPSAltitude }, - { ExifTag.GPSDOP }, - { ExifTag.GPSSpeed }, - { ExifTag.GPSTrack }, - { ExifTag.GPSImgDirection }, - { ExifTag.GPSDestBearing }, - { ExifTag.GPSDestDistance }, - { ExifTag.GPSHPositioningError }, + (ExifTag)ExifTag.XPosition, + (ExifTag)ExifTag.YPosition, + (ExifTag)ExifTag.XResolution, + (ExifTag)ExifTag.YResolution, + (ExifTag)ExifTag.BatteryLevel, + (ExifTag)ExifTag.ExposureTime, + (ExifTag)ExifTag.FNumber, + (ExifTag)ExifTag.MDScalePixel, + (ExifTag)ExifTag.CompressedBitsPerPixel, + (ExifTag)ExifTag.ApertureValue, + (ExifTag)ExifTag.MaxApertureValue, + (ExifTag)ExifTag.SubjectDistance, + (ExifTag)ExifTag.FocalLength, + (ExifTag)ExifTag.FlashEnergy2, + (ExifTag)ExifTag.FocalPlaneXResolution2, + (ExifTag)ExifTag.FocalPlaneYResolution2, + (ExifTag)ExifTag.ExposureIndex2, + (ExifTag)ExifTag.Humidity, + (ExifTag)ExifTag.Pressure, + (ExifTag)ExifTag.Acceleration, + (ExifTag)ExifTag.FlashEnergy, + (ExifTag)ExifTag.FocalPlaneXResolution, + (ExifTag)ExifTag.FocalPlaneYResolution, + (ExifTag)ExifTag.ExposureIndex, + (ExifTag)ExifTag.DigitalZoomRatio, + (ExifTag)ExifTag.GPSAltitude, + (ExifTag)ExifTag.GPSDOP, + (ExifTag)ExifTag.GPSSpeed, + (ExifTag)ExifTag.GPSTrack, + (ExifTag)ExifTag.GPSImgDirection, + (ExifTag)ExifTag.GPSDestBearing, + (ExifTag)ExifTag.GPSDestDistance, + (ExifTag)ExifTag.GPSHPositioningError, }; public static TheoryData RationalArrayTags => new() { - { ExifTag.WhitePoint }, - { ExifTag.PrimaryChromaticities }, - { ExifTag.YCbCrCoefficients }, - { ExifTag.ReferenceBlackWhite }, - { ExifTag.GPSLatitude }, - { ExifTag.GPSLongitude }, - { ExifTag.GPSTimestamp }, - { ExifTag.GPSDestLatitude }, - { ExifTag.GPSDestLongitude }, - { ExifTag.LensSpecification } + (ExifTag)ExifTag.WhitePoint, + (ExifTag)ExifTag.PrimaryChromaticities, + (ExifTag)ExifTag.YCbCrCoefficients, + (ExifTag)ExifTag.ReferenceBlackWhite, + (ExifTag)ExifTag.GPSLatitude, + (ExifTag)ExifTag.GPSLongitude, + (ExifTag)ExifTag.GPSTimestamp, + (ExifTag)ExifTag.GPSDestLatitude, + (ExifTag)ExifTag.GPSDestLongitude, + (ExifTag)ExifTag.LensSpecification }; public static TheoryData ShortTags => new() { - { ExifTag.OldSubfileType }, - { ExifTag.Compression }, - { ExifTag.PhotometricInterpretation }, - { ExifTag.Thresholding }, - { ExifTag.CellWidth }, - { ExifTag.CellLength }, - { ExifTag.FillOrder }, - { ExifTag.Orientation }, - { ExifTag.SamplesPerPixel }, - { ExifTag.PlanarConfiguration }, - { ExifTag.Predictor }, - { ExifTag.GrayResponseUnit }, - { ExifTag.ResolutionUnit }, - { ExifTag.CleanFaxData }, - { ExifTag.InkSet }, - { ExifTag.NumberOfInks }, - { ExifTag.DotRange }, - { ExifTag.Indexed }, - { ExifTag.OPIProxy }, - { ExifTag.JPEGProc }, - { ExifTag.JPEGRestartInterval }, - { ExifTag.YCbCrPositioning }, - { ExifTag.Rating }, - { ExifTag.RatingPercent }, - { ExifTag.ExposureProgram }, - { ExifTag.Interlace }, - { ExifTag.SelfTimerMode }, - { ExifTag.SensitivityType }, - { ExifTag.MeteringMode }, - { ExifTag.LightSource }, - { ExifTag.FocalPlaneResolutionUnit2 }, - { ExifTag.SensingMethod2 }, - { ExifTag.Flash }, - { ExifTag.ColorSpace }, - { ExifTag.FocalPlaneResolutionUnit }, - { ExifTag.SensingMethod }, - { ExifTag.CustomRendered }, - { ExifTag.ExposureMode }, - { ExifTag.WhiteBalance }, - { ExifTag.FocalLengthIn35mmFilm }, - { ExifTag.SceneCaptureType }, - { ExifTag.GainControl }, - { ExifTag.Contrast }, - { ExifTag.Saturation }, - { ExifTag.Sharpness }, - { ExifTag.SubjectDistanceRange }, - { ExifTag.GPSDifferential } + (ExifTag)ExifTag.OldSubfileType, + (ExifTag)ExifTag.Compression, + (ExifTag)ExifTag.PhotometricInterpretation, + (ExifTag)ExifTag.Thresholding, + (ExifTag)ExifTag.CellWidth, + (ExifTag)ExifTag.CellLength, + (ExifTag)ExifTag.FillOrder, + (ExifTag)ExifTag.Orientation, + (ExifTag)ExifTag.SamplesPerPixel, + (ExifTag)ExifTag.PlanarConfiguration, + (ExifTag)ExifTag.Predictor, + (ExifTag)ExifTag.GrayResponseUnit, + (ExifTag)ExifTag.ResolutionUnit, + (ExifTag)ExifTag.CleanFaxData, + (ExifTag)ExifTag.InkSet, + (ExifTag)ExifTag.NumberOfInks, + (ExifTag)ExifTag.DotRange, + (ExifTag)ExifTag.Indexed, + (ExifTag)ExifTag.OPIProxy, + (ExifTag)ExifTag.JPEGProc, + (ExifTag)ExifTag.JPEGRestartInterval, + (ExifTag)ExifTag.YCbCrPositioning, + (ExifTag)ExifTag.Rating, + (ExifTag)ExifTag.RatingPercent, + (ExifTag)ExifTag.ExposureProgram, + (ExifTag)ExifTag.Interlace, + (ExifTag)ExifTag.SelfTimerMode, + (ExifTag)ExifTag.SensitivityType, + (ExifTag)ExifTag.MeteringMode, + (ExifTag)ExifTag.LightSource, + (ExifTag)ExifTag.FocalPlaneResolutionUnit2, + (ExifTag)ExifTag.SensingMethod2, + (ExifTag)ExifTag.Flash, + (ExifTag)ExifTag.ColorSpace, + (ExifTag)ExifTag.FocalPlaneResolutionUnit, + (ExifTag)ExifTag.SensingMethod, + (ExifTag)ExifTag.CustomRendered, + (ExifTag)ExifTag.ExposureMode, + (ExifTag)ExifTag.WhiteBalance, + (ExifTag)ExifTag.FocalLengthIn35mmFilm, + (ExifTag)ExifTag.SceneCaptureType, + (ExifTag)ExifTag.GainControl, + (ExifTag)ExifTag.Contrast, + (ExifTag)ExifTag.Saturation, + (ExifTag)ExifTag.Sharpness, + (ExifTag)ExifTag.SubjectDistanceRange, + (ExifTag)ExifTag.GPSDifferential }; public static TheoryData ShortArrayTags => new() { - { ExifTag.BitsPerSample }, - { ExifTag.MinSampleValue }, - { ExifTag.MaxSampleValue }, - { ExifTag.GrayResponseCurve }, - { ExifTag.ColorMap }, - { ExifTag.ExtraSamples }, - { ExifTag.PageNumber }, - { ExifTag.TransferFunction }, - { ExifTag.HalftoneHints }, - { ExifTag.SampleFormat }, - { ExifTag.TransferRange }, - { ExifTag.DefaultImageColor }, - { ExifTag.JPEGLosslessPredictors }, - { ExifTag.JPEGPointTransforms }, - { ExifTag.YCbCrSubsampling }, - { ExifTag.CFARepeatPatternDim }, - { ExifTag.IntergraphPacketData }, - { ExifTag.ISOSpeedRatings }, - { ExifTag.SubjectArea }, - { ExifTag.SubjectLocation } + (ExifTag)ExifTag.BitsPerSample, + (ExifTag)ExifTag.MinSampleValue, + (ExifTag)ExifTag.MaxSampleValue, + (ExifTag)ExifTag.GrayResponseCurve, + (ExifTag)ExifTag.ColorMap, + (ExifTag)ExifTag.ExtraSamples, + (ExifTag)ExifTag.PageNumber, + (ExifTag)ExifTag.TransferFunction, + (ExifTag)ExifTag.HalftoneHints, + (ExifTag)ExifTag.SampleFormat, + (ExifTag)ExifTag.TransferRange, + (ExifTag)ExifTag.DefaultImageColor, + (ExifTag)ExifTag.JPEGLosslessPredictors, + (ExifTag)ExifTag.JPEGPointTransforms, + (ExifTag)ExifTag.YCbCrSubsampling, + (ExifTag)ExifTag.CFARepeatPatternDim, + (ExifTag)ExifTag.IntergraphPacketData, + (ExifTag)ExifTag.ISOSpeedRatings, + (ExifTag)ExifTag.SubjectArea, + (ExifTag)ExifTag.SubjectLocation }; public static TheoryData SignedRationalTags => new() { - { ExifTag.ShutterSpeedValue }, - { ExifTag.BrightnessValue }, - { ExifTag.ExposureBiasValue }, - { ExifTag.AmbientTemperature }, - { ExifTag.WaterDepth }, - { ExifTag.CameraElevationAngle } + (ExifTag)ExifTag.ShutterSpeedValue, + (ExifTag)ExifTag.BrightnessValue, + (ExifTag)ExifTag.ExposureBiasValue, + (ExifTag)ExifTag.AmbientTemperature, + (ExifTag)ExifTag.WaterDepth, + (ExifTag)ExifTag.CameraElevationAngle }; public static TheoryData SignedRationalArrayTags => new() { - { ExifTag.Decode } + (ExifTag)ExifTag.Decode }; public static TheoryData SignedShortArrayTags => new() { - { ExifTag.TimeZoneOffset } + (ExifTag)ExifTag.TimeZoneOffset }; public static TheoryData StringTags => new() { - { ExifTag.ImageDescription }, - { ExifTag.Make }, - { ExifTag.Model }, - { ExifTag.Software }, - { ExifTag.DateTime }, - { ExifTag.Artist }, - { ExifTag.HostComputer }, - { ExifTag.Copyright }, - { ExifTag.DocumentName }, - { ExifTag.PageName }, - { ExifTag.InkNames }, - { ExifTag.TargetPrinter }, - { ExifTag.ImageID }, - { ExifTag.MDLabName }, - { ExifTag.MDSampleInfo }, - { ExifTag.MDPrepDate }, - { ExifTag.MDPrepTime }, - { ExifTag.MDFileUnits }, - { ExifTag.SEMInfo }, - { ExifTag.SpectralSensitivity }, - { ExifTag.DateTimeOriginal }, - { ExifTag.DateTimeDigitized }, - { ExifTag.SubsecTime }, - { ExifTag.SubsecTimeOriginal }, - { ExifTag.SubsecTimeDigitized }, - { ExifTag.RelatedSoundFile }, - { ExifTag.FaxSubaddress }, - { ExifTag.OffsetTime }, - { ExifTag.OffsetTimeOriginal }, - { ExifTag.OffsetTimeDigitized }, - { ExifTag.SecurityClassification }, - { ExifTag.ImageHistory }, - { ExifTag.ImageUniqueID }, - { ExifTag.OwnerName }, - { ExifTag.SerialNumber }, - { ExifTag.LensMake }, - { ExifTag.LensModel }, - { ExifTag.LensSerialNumber }, - { ExifTag.GDALMetadata }, - { ExifTag.GDALNoData }, - { ExifTag.GPSLatitudeRef }, - { ExifTag.GPSLongitudeRef }, - { ExifTag.GPSSatellites }, - { ExifTag.GPSStatus }, - { ExifTag.GPSMeasureMode }, - { ExifTag.GPSSpeedRef }, - { ExifTag.GPSTrackRef }, - { ExifTag.GPSImgDirectionRef }, - { ExifTag.GPSMapDatum }, - { ExifTag.GPSDestLatitudeRef }, - { ExifTag.GPSDestLongitudeRef }, - { ExifTag.GPSDestBearingRef }, - { ExifTag.GPSDestDistanceRef }, - { ExifTag.GPSDateStamp }, + (ExifTag)ExifTag.ImageDescription, + (ExifTag)ExifTag.Make, + (ExifTag)ExifTag.Model, + (ExifTag)ExifTag.Software, + (ExifTag)ExifTag.DateTime, + (ExifTag)ExifTag.Artist, + (ExifTag)ExifTag.HostComputer, + (ExifTag)ExifTag.Copyright, + (ExifTag)ExifTag.DocumentName, + (ExifTag)ExifTag.PageName, + (ExifTag)ExifTag.InkNames, + (ExifTag)ExifTag.TargetPrinter, + (ExifTag)ExifTag.ImageID, + (ExifTag)ExifTag.MDLabName, + (ExifTag)ExifTag.MDSampleInfo, + (ExifTag)ExifTag.MDPrepDate, + (ExifTag)ExifTag.MDPrepTime, + (ExifTag)ExifTag.MDFileUnits, + (ExifTag)ExifTag.SEMInfo, + (ExifTag)ExifTag.SpectralSensitivity, + (ExifTag)ExifTag.DateTimeOriginal, + (ExifTag)ExifTag.DateTimeDigitized, + (ExifTag)ExifTag.SubsecTime, + (ExifTag)ExifTag.SubsecTimeOriginal, + (ExifTag)ExifTag.SubsecTimeDigitized, + (ExifTag)ExifTag.RelatedSoundFile, + (ExifTag)ExifTag.FaxSubaddress, + (ExifTag)ExifTag.OffsetTime, + (ExifTag)ExifTag.OffsetTimeOriginal, + (ExifTag)ExifTag.OffsetTimeDigitized, + (ExifTag)ExifTag.SecurityClassification, + (ExifTag)ExifTag.ImageHistory, + (ExifTag)ExifTag.ImageUniqueID, + (ExifTag)ExifTag.OwnerName, + (ExifTag)ExifTag.SerialNumber, + (ExifTag)ExifTag.LensMake, + (ExifTag)ExifTag.LensModel, + (ExifTag)ExifTag.LensSerialNumber, + (ExifTag)ExifTag.GDALMetadata, + (ExifTag)ExifTag.GDALNoData, + (ExifTag)ExifTag.GPSLatitudeRef, + (ExifTag)ExifTag.GPSLongitudeRef, + (ExifTag)ExifTag.GPSSatellites, + (ExifTag)ExifTag.GPSStatus, + (ExifTag)ExifTag.GPSMeasureMode, + (ExifTag)ExifTag.GPSSpeedRef, + (ExifTag)ExifTag.GPSTrackRef, + (ExifTag)ExifTag.GPSImgDirectionRef, + (ExifTag)ExifTag.GPSMapDatum, + (ExifTag)ExifTag.GPSDestLatitudeRef, + (ExifTag)ExifTag.GPSDestLongitudeRef, + (ExifTag)ExifTag.GPSDestBearingRef, + (ExifTag)ExifTag.GPSDestDistanceRef, + (ExifTag)ExifTag.GPSDateStamp, }; public static TheoryData UndefinedTags => new() { - { ExifTag.FileSource }, - { ExifTag.SceneType } + (ExifTag)ExifTag.FileSource, + (ExifTag)ExifTag.SceneType }; public static TheoryData UndefinedArrayTags => new() { - { ExifTag.JPEGTables }, - { ExifTag.OECF }, - { ExifTag.ExifVersion }, - { ExifTag.ComponentsConfiguration }, - { ExifTag.MakerNote }, - { ExifTag.FlashpixVersion }, - { ExifTag.SpatialFrequencyResponse }, - { ExifTag.SpatialFrequencyResponse2 }, - { ExifTag.Noise }, - { ExifTag.CFAPattern }, - { ExifTag.DeviceSettingDescription }, - { ExifTag.ImageSourceData }, + (ExifTag)ExifTag.JPEGTables, + (ExifTag)ExifTag.OECF, + (ExifTag)ExifTag.ExifVersion, + (ExifTag)ExifTag.ComponentsConfiguration, + (ExifTag)ExifTag.MakerNote, + (ExifTag)ExifTag.FlashpixVersion, + (ExifTag)ExifTag.SpatialFrequencyResponse, + (ExifTag)ExifTag.SpatialFrequencyResponse2, + (ExifTag)ExifTag.Noise, + (ExifTag)ExifTag.CFAPattern, + (ExifTag)ExifTag.DeviceSettingDescription, + (ExifTag)ExifTag.ImageSourceData, }; public static TheoryData EncodedStringTags => new() { - { ExifTag.UserComment }, - { ExifTag.GPSProcessingMethod }, - { ExifTag.GPSAreaInformation } + (ExifTag)ExifTag.UserComment, + (ExifTag)ExifTag.GPSProcessingMethod, + (ExifTag)ExifTag.GPSAreaInformation }; public static TheoryData Ucs2StringTags => new() { - { ExifTag.XPTitle }, - { ExifTag.XPComment }, - { ExifTag.XPAuthor }, - { ExifTag.XPKeywords }, - { ExifTag.XPSubject }, + (ExifTag)ExifTag.XPTitle, + (ExifTag)ExifTag.XPComment, + (ExifTag)ExifTag.XPAuthor, + (ExifTag)ExifTag.XPKeywords, + (ExifTag)ExifTag.XPSubject, }; [Theory] diff --git a/tests/ImageSharp.Tests/PixelFormats/L8Tests.cs b/tests/ImageSharp.Tests/PixelFormats/L8Tests.cs index 1ca865ef4..58f226f50 100644 --- a/tests/ImageSharp.Tests/PixelFormats/L8Tests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/L8Tests.cs @@ -12,7 +12,11 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats; public class L8Tests { public static readonly TheoryData LuminanceData - = new() { 0, 1, 2, 3, 5, 13, 31, 71, 73, 79, 83, 109, 127, 128, 131, 199, 250, 251, 254, 255 }; + = + [ + (byte)0, (byte)1, (byte)2, (byte)3, (byte)5, (byte)13, (byte)31, (byte)71, (byte)73, (byte)79, (byte)83, + (byte)109, (byte)127, (byte)128, (byte)131, (byte)199, (byte)250, (byte)251, (byte)254, (byte)255 + ]; [Theory] [InlineData(0)] diff --git a/tests/ImageSharp.Tests/PixelFormats/La16Tests.cs b/tests/ImageSharp.Tests/PixelFormats/La16Tests.cs index f6cbfc442..d37d125e1 100644 --- a/tests/ImageSharp.Tests/PixelFormats/La16Tests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/La16Tests.cs @@ -12,7 +12,11 @@ namespace SixLabors.ImageSharp.Tests.PixelFormats; public class La16Tests { public static readonly TheoryData LuminanceData - = new() { 0, 1, 2, 3, 5, 13, 31, 71, 73, 79, 83, 109, 127, 128, 131, 199, 250, 251, 254, 255 }; + = + [ + (byte)0, (byte)1, (byte)2, (byte)3, (byte)5, (byte)13, (byte)31, (byte)71, (byte)73, (byte)79, (byte)83, + (byte)109, (byte)127, (byte)128, (byte)131, (byte)199, (byte)250, (byte)251, (byte)254, (byte)255 + ]; [Theory] [InlineData(0, 0)] diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/PixelOperationsTests.Specialized.Generated.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/PixelOperationsTests.Specialized.Generated.cs index 3747b41ee..306c2e628 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/PixelOperationsTests.Specialized.Generated.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/PixelOperationsTests.Specialized.Generated.cs @@ -5,13 +5,12 @@ using SixLabors.ImageSharp.PixelFormats; using Xunit; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations; public partial class PixelOperationsTests { - + public partial class A8_OperationsTests : PixelOperationsTests { public A8_OperationsTests(ITestOutputHelper output) diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/_Common.ttinclude b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/_Common.ttinclude index e4a7e881e..90c706733 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/_Common.ttinclude +++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/Generated/_Common.ttinclude @@ -10,7 +10,6 @@ using SixLabors.ImageSharp.PixelFormats; using Xunit; -using Xunit.Abstractions; <#+ private static readonly string[] UnassociatedAlphaPixelTypes = [ diff --git a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs index c569919f5..81f601551 100644 --- a/tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs +++ b/tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs @@ -10,7 +10,6 @@ using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.Common; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.PixelFormats.PixelOperations; @@ -318,46 +317,47 @@ public abstract class PixelOperationsTests : MeasureFixture (s, d) => this.Operations.ToVector4(this.Configuration, s, d.GetSpan())); } - public static readonly TheoryData Generic_To_Data = new() - { - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - new TestPixel(), - }; + public static readonly TheoryData Generic_To_Data = new( + new object[] + { + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + new TestPixel(), + }); [Theory] [MemberData(nameof(Generic_To_Data))] diff --git a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs index 3d4c239c9..b440d56eb 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Convolution/BokehBlurTest.cs @@ -8,7 +8,7 @@ using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Convolution; using SixLabors.ImageSharp.Tests.TestUtilities; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Convolution; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs index 25acd3aa6..3c2e5e0d5 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Dithering/DitherTests.cs @@ -43,8 +43,8 @@ public class DitherTests public static readonly TheoryData DefaultInstanceDitherers = new() { - default(ErrorDither), - default(OrderedDither) + (IDither)default(ErrorDither), + (IDither)default(OrderedDither) }; private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.05f); diff --git a/tests/ImageSharp.Tests/Processing/Processors/Quantization/QuantizerTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Quantization/QuantizerTests.cs index 00e09d83b..4668d0c29 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Quantization/QuantizerTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Quantization/QuantizerTests.cs @@ -78,75 +78,75 @@ public class QuantizerTests KnownQuantizers.WebSafe, KnownQuantizers.Werner, KnownQuantizers.Wu, - new HexadecatreeQuantizer(NoDitherOptions), - new WebSafePaletteQuantizer(NoDitherOptions), - new WernerPaletteQuantizer(NoDitherOptions), - new WuQuantizer(NoDitherOptions), - new HexadecatreeQuantizer(OrderedDitherOptions), - new WebSafePaletteQuantizer(OrderedDitherOptions), - new WernerPaletteQuantizer(OrderedDitherOptions), - new WuQuantizer(OrderedDitherOptions) + (IQuantizer)new HexadecatreeQuantizer(NoDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(NoDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(NoDitherOptions), + (IQuantizer)new WuQuantizer(NoDitherOptions), + (IQuantizer)new HexadecatreeQuantizer(OrderedDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(OrderedDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(OrderedDitherOptions), + (IQuantizer)new WuQuantizer(OrderedDitherOptions) }; public static readonly TheoryData DitherScaleQuantizers = new() { - new HexadecatreeQuantizer(Diffuser0_ScaleDitherOptions), - new WebSafePaletteQuantizer(Diffuser0_ScaleDitherOptions), - new WernerPaletteQuantizer(Diffuser0_ScaleDitherOptions), - new WuQuantizer(Diffuser0_ScaleDitherOptions), - - new HexadecatreeQuantizer(Diffuser0_25_ScaleDitherOptions), - new WebSafePaletteQuantizer(Diffuser0_25_ScaleDitherOptions), - new WernerPaletteQuantizer(Diffuser0_25_ScaleDitherOptions), - new WuQuantizer(Diffuser0_25_ScaleDitherOptions), - - new HexadecatreeQuantizer(Diffuser0_5_ScaleDitherOptions), - new WebSafePaletteQuantizer(Diffuser0_5_ScaleDitherOptions), - new WernerPaletteQuantizer(Diffuser0_5_ScaleDitherOptions), - new WuQuantizer(Diffuser0_5_ScaleDitherOptions), - - new HexadecatreeQuantizer(Diffuser0_75_ScaleDitherOptions), - new WebSafePaletteQuantizer(Diffuser0_75_ScaleDitherOptions), - new WernerPaletteQuantizer(Diffuser0_75_ScaleDitherOptions), - new WuQuantizer(Diffuser0_75_ScaleDitherOptions), - - new HexadecatreeQuantizer(DiffuserDitherOptions), - new WebSafePaletteQuantizer(DiffuserDitherOptions), - new WernerPaletteQuantizer(DiffuserDitherOptions), - new WuQuantizer(DiffuserDitherOptions), - - new HexadecatreeQuantizer(Ordered0_ScaleDitherOptions), - new WebSafePaletteQuantizer(Ordered0_ScaleDitherOptions), - new WernerPaletteQuantizer(Ordered0_ScaleDitherOptions), - new WuQuantizer(Ordered0_ScaleDitherOptions), - - new HexadecatreeQuantizer(Ordered0_25_ScaleDitherOptions), - new WebSafePaletteQuantizer(Ordered0_25_ScaleDitherOptions), - new WernerPaletteQuantizer(Ordered0_25_ScaleDitherOptions), - new WuQuantizer(Ordered0_25_ScaleDitherOptions), - - new HexadecatreeQuantizer(Ordered0_5_ScaleDitherOptions), - new WebSafePaletteQuantizer(Ordered0_5_ScaleDitherOptions), - new WernerPaletteQuantizer(Ordered0_5_ScaleDitherOptions), - new WuQuantizer(Ordered0_5_ScaleDitherOptions), - - new HexadecatreeQuantizer(Ordered0_75_ScaleDitherOptions), - new WebSafePaletteQuantizer(Ordered0_75_ScaleDitherOptions), - new WernerPaletteQuantizer(Ordered0_75_ScaleDitherOptions), - new WuQuantizer(Ordered0_75_ScaleDitherOptions), - - new HexadecatreeQuantizer(OrderedDitherOptions), - new WebSafePaletteQuantizer(OrderedDitherOptions), - new WernerPaletteQuantizer(OrderedDitherOptions), - new WuQuantizer(OrderedDitherOptions), + (IQuantizer)new HexadecatreeQuantizer(Diffuser0_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Diffuser0_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Diffuser0_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Diffuser0_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Diffuser0_25_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Diffuser0_25_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Diffuser0_25_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Diffuser0_25_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Diffuser0_5_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Diffuser0_5_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Diffuser0_5_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Diffuser0_5_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Diffuser0_75_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Diffuser0_75_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Diffuser0_75_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Diffuser0_75_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(DiffuserDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(DiffuserDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(DiffuserDitherOptions), + (IQuantizer)new WuQuantizer(DiffuserDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Ordered0_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Ordered0_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Ordered0_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Ordered0_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Ordered0_25_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Ordered0_25_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Ordered0_25_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Ordered0_25_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Ordered0_5_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Ordered0_5_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Ordered0_5_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Ordered0_5_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(Ordered0_75_ScaleDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(Ordered0_75_ScaleDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(Ordered0_75_ScaleDitherOptions), + (IQuantizer)new WuQuantizer(Ordered0_75_ScaleDitherOptions), + + (IQuantizer)new HexadecatreeQuantizer(OrderedDitherOptions), + (IQuantizer)new WebSafePaletteQuantizer(OrderedDitherOptions), + (IQuantizer)new WernerPaletteQuantizer(OrderedDitherOptions), + (IQuantizer)new WuQuantizer(OrderedDitherOptions), }; public static readonly TheoryData DefaultInstanceDitherers = new() { - default(ErrorDither), - default(OrderedDither) + (IDither)default(ErrorDither), + (IDither)default(OrderedDither) }; private static readonly ImageComparer ValidatorComparer = ImageComparer.TolerantPercentage(0.05F); diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs index 941d78c43..2697505c2 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/AffineTransformTests.cs @@ -7,7 +7,6 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Transforms; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Processing.Transforms; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs index c65f136d6..86b1903bb 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ProjectiveTransformTests.cs @@ -9,7 +9,6 @@ using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Transforms; using SixLabors.ImageSharp.Tests.TestUtilities; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeKernelMapTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeKernelMapTests.cs index 5f9a8055f..7e85efee4 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeKernelMapTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/ResizeKernelMapTests.cs @@ -4,7 +4,6 @@ using System.Text; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing.Processors.Transforms; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms; diff --git a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs index 5eee7313d..cb56c04d9 100644 --- a/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs +++ b/tests/ImageSharp.Tests/Processing/Processors/Transforms/RotateTests.cs @@ -12,20 +12,16 @@ namespace SixLabors.ImageSharp.Tests.Processing.Processors.Transforms; [GroupOutput("Transforms")] public class RotateTests { - public static readonly TheoryData RotateAngles - = new() - { - 50, -50, 170, -170 - }; + public static readonly TheoryData RotateAngles = [50f, -50f, 170f, -170f]; public static readonly TheoryData RotateEnumValues - = new() - { + = + [ RotateMode.None, RotateMode.Rotate90, RotateMode.Rotate180, RotateMode.Rotate270 - }; + ]; [Theory] [WithTestPatternImages(nameof(RotateAngles), 100, 50, PixelTypes.Rgba32)] diff --git a/tests/ImageSharp.Tests/ProfilingBenchmarks/LoadResizeSaveProfilingBenchmarks.cs b/tests/ImageSharp.Tests/ProfilingBenchmarks/LoadResizeSaveProfilingBenchmarks.cs index 209dd361e..e3a5922b1 100644 --- a/tests/ImageSharp.Tests/ProfilingBenchmarks/LoadResizeSaveProfilingBenchmarks.cs +++ b/tests/ImageSharp.Tests/ProfilingBenchmarks/LoadResizeSaveProfilingBenchmarks.cs @@ -3,7 +3,6 @@ using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Processing; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.ProfilingBenchmarks; diff --git a/tests/ImageSharp.Tests/ProfilingBenchmarks/ResizeProfilingBenchmarks.cs b/tests/ImageSharp.Tests/ProfilingBenchmarks/ResizeProfilingBenchmarks.cs index bab11b0f9..145d0e58d 100644 --- a/tests/ImageSharp.Tests/ProfilingBenchmarks/ResizeProfilingBenchmarks.cs +++ b/tests/ImageSharp.Tests/ProfilingBenchmarks/ResizeProfilingBenchmarks.cs @@ -3,7 +3,6 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.ProfilingBenchmarks; diff --git a/tests/ImageSharp.Tests/Quantization/AlphaAssociationQuantizerTests.cs b/tests/ImageSharp.Tests/Quantization/AlphaAssociationQuantizerTests.cs index ddad67b94..bda3fb262 100644 --- a/tests/ImageSharp.Tests/Quantization/AlphaAssociationQuantizerTests.cs +++ b/tests/ImageSharp.Tests/Quantization/AlphaAssociationQuantizerTests.cs @@ -12,7 +12,7 @@ public class AlphaAssociationQuantizerTests { public static TheoryData Dithers { get; } = new() { - null, + (IDither?)null, KnownDitherings.Bayer4x4, KnownDitherings.FloydSteinberg }; diff --git a/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs b/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs index 7191f3ba7..11b8e5847 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Attributes/ImageDataAttributeBase.cs @@ -3,6 +3,7 @@ using System.Reflection; using Xunit.Sdk; +using Xunit.v3; namespace SixLabors.ImageSharp.Tests; @@ -42,11 +43,22 @@ public abstract class ImageDataAttributeBase : DataAttribute /// public Type MemberType { get; set; } + /// + public override bool SupportsDiscoveryEnumeration() => true; + + /// + public override ValueTask> GetData(MethodInfo testMethod, DisposalTracker disposalTracker) + { + IEnumerable rows = this.GetDataRows(testMethod); + IReadOnlyCollection result = rows.Select(row => ConvertDataRow(row)).ToList(); + return new ValueTask>(result); + } + /// Returns the data to be used to test the theory. /// The method that is being tested /// One or more sets of theory data. Each invocation of the test method /// is represented by a single object array. - public override IEnumerable GetData(MethodInfo testMethod) + private IEnumerable GetDataRows(MethodInfo testMethod) { IEnumerable addedRows = Enumerable.Empty().ToArray(); if (!string.IsNullOrWhiteSpace(this.MemberName)) @@ -59,11 +71,22 @@ public abstract class ImageDataAttributeBase : DataAttribute object obj = accessor(); if (obj is IEnumerable memberItems) { - addedRows = memberItems.Select(x => x as object[]); - if (addedRows.Any(x => x == null)) + // In xunit.v3, TheoryData yields ITheoryDataRow, not object[]. + // Call GetData to unpack the row's values. + addedRows = memberItems.Select(x => { - addedRows = memberItems.Select(x => new[] { x }); - } + if (x is ITheoryDataRow row) + { + return row.GetData(); + } + + if (x is object[] array) + { + return array; + } + + return [x]; + }); } } } diff --git a/tests/ImageSharp.Tests/TestUtilities/BasicSerializer.cs b/tests/ImageSharp.Tests/TestUtilities/BasicSerializer.cs index 216ed95b8..b785558c8 100644 --- a/tests/ImageSharp.Tests/TestUtilities/BasicSerializer.cs +++ b/tests/ImageSharp.Tests/TestUtilities/BasicSerializer.cs @@ -2,7 +2,7 @@ // Licensed under the Six Labors Split License. using System.ComponentModel; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.TestUtilities; @@ -13,7 +13,7 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities; /// internal class BasicSerializer : IXunitSerializationInfo { - private readonly Dictionary map = []; + private readonly Dictionary map = []; public const char Separator = ':'; @@ -22,9 +22,10 @@ internal class BasicSerializer : IXunitSerializationInfo using MemoryStream ms = new(); using StreamWriter writer = new(ms); writer.WriteLine(type.FullName); - foreach (KeyValuePair kv in this.map) + foreach (KeyValuePair kv in this.map) { - writer.WriteLine($"{kv.Key}{Separator}{kv.Value}"); + // Format: key:TypeAssemblyQualifiedName:value + writer.WriteLine($"{kv.Key}{Separator}{kv.Value.Type.AssemblyQualifiedName}{Separator}{kv.Value.Str}"); } writer.Flush(); @@ -41,8 +42,13 @@ internal class BasicSerializer : IXunitSerializationInfo Type type = Type.GetType(reader.ReadLine()); for (string s = reader.ReadLine(); s != null; s = reader.ReadLine()) { - string[] kv = s.Split(Separator); - this.map[kv[0]] = kv[1]; + // Format: key:TypeAssemblyQualifiedName:value + string[] parts = s.Split(Separator, 3); + if (parts.Length == 3) + { + Type valueType = Type.GetType(parts[1]) ?? typeof(string); + this.map[parts[0]] = (parts[2], valueType); + } } return type; @@ -76,20 +82,18 @@ internal class BasicSerializer : IXunitSerializationInfo type ??= value.GetType(); - this.map[key] = TypeDescriptor.GetConverter(type).ConvertToInvariantString(value); + this.map[key] = (TypeDescriptor.GetConverter(type).ConvertToInvariantString(value), type); } - public object GetValue(string key, Type type) + public object GetValue(string key) { Guard.NotNull(key, nameof(key)); - if (!this.map.TryGetValue(key, out string str)) + if (!this.map.TryGetValue(key, out (string Str, Type Type) entry)) { - return type.IsValueType ? Activator.CreateInstance(type) : null; + return null; } - return TypeDescriptor.GetConverter(type).ConvertFromInvariantString(str); + return TypeDescriptor.GetConverter(entry.Type).ConvertFromInvariantString(entry.Str); } - - public T GetValue(string key) => (T)this.GetValue(key, typeof(T)); } diff --git a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs index 4cd30fc57..bbe5f221a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs +++ b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Globalization; using Microsoft.DotNet.RemoteExecutor; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.TestUtilities; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs index ee1d27471..676fcff7f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BasicTestPatternProvider.cs @@ -2,7 +2,7 @@ // Licensed under the Six Labors Split License. using System.Numerics; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs index c8c3e09c3..35cd7832f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/BlankProvider.cs @@ -2,8 +2,7 @@ // Licensed under the Six Labors Split License. using SixLabors.ImageSharp.PixelFormats; - -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs index 3f6e78a34..e1e86ca9a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/FileProvider.cs @@ -6,8 +6,7 @@ using System.Reflection; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; - -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs index 6da5b75f0..98c03b0f8 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/MemberMethodProvider.cs @@ -3,7 +3,7 @@ using System.Reflection; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs index d78edf5bc..c83d3eba8 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/SolidProvider.cs @@ -3,7 +3,7 @@ using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs index ab624126b..6cfe97db2 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestImageProvider.cs @@ -7,8 +7,7 @@ using Castle.Core.Internal; using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; - -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs index 12a7ad4e2..400ce733a 100644 --- a/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs +++ b/tests/ImageSharp.Tests/TestUtilities/ImageProviders/TestPatternProvider.cs @@ -4,7 +4,7 @@ using System.Numerics; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs b/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs index 81f16cf6b..2fd71e213 100644 --- a/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs +++ b/tests/ImageSharp.Tests/TestUtilities/MeasureFixture.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.Runtime.CompilerServices; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/SixLaborsXunitTestFramework.cs b/tests/ImageSharp.Tests/TestUtilities/SixLaborsXunitTestFramework.cs index d8b0ff785..f3c19f117 100644 --- a/tests/ImageSharp.Tests/TestUtilities/SixLaborsXunitTestFramework.cs +++ b/tests/ImageSharp.Tests/TestUtilities/SixLaborsXunitTestFramework.cs @@ -3,22 +3,13 @@ using BenchmarkDotNet.Environments; using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; -using Xunit.Sdk; +using Xunit.v3; -[assembly: Xunit.TestFramework(SixLaborsXunitTestFramework.Type, SixLaborsXunitTestFramework.Assembly)] +[assembly: Xunit.TestFramework(typeof(SixLaborsXunitTestFramework))] namespace SixLabors.ImageSharp.Tests.TestUtilities; public class SixLaborsXunitTestFramework : XunitTestFramework { - public const string Type = "SixLabors.ImageSharp.Tests.TestUtilities.SixLaborsXunitTestFramework"; - public const string Assembly = "SixLabors.ImageSharp.Tests"; - - public SixLaborsXunitTestFramework(IMessageSink messageSink) - : base(messageSink) - { - DiagnosticMessage message = new(HostEnvironmentInfo.GetInformation()); - messageSink.OnMessage(message); - } + public SixLaborsXunitTestFramework() => Console.Error.WriteLine(HostEnvironmentInfo.GetInformation()); } diff --git a/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs b/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs index 174766daf..c8383eacd 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestPixel.cs @@ -3,7 +3,7 @@ using System.Numerics; using SixLabors.ImageSharp.PixelFormats; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.TestUtilities; diff --git a/tests/ImageSharp.Tests/TestUtilities/TestType.cs b/tests/ImageSharp.Tests/TestUtilities/TestType.cs index 5b4f6a602..dbb267b33 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestType.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestType.cs @@ -1,7 +1,7 @@ // Copyright (c) Six Labors. // Licensed under the Six Labors Split License. -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.TestUtilities; diff --git a/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs b/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs index 350333965..c4ad50437 100644 --- a/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs +++ b/tests/ImageSharp.Tests/TestUtilities/TestVector4.cs @@ -2,7 +2,7 @@ // Licensed under the Six Labors Split License. using System.Numerics; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests.TestUtilities; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/BasicSerializerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/BasicSerializerTests.cs index 1b5b43f03..2f0e73f20 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/BasicSerializerTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/BasicSerializerTests.cs @@ -2,7 +2,7 @@ // Licensed under the Six Labors Split License. using SixLabors.ImageSharp.Tests.TestUtilities; -using Xunit.Abstractions; +using Xunit.Sdk; namespace SixLabors.ImageSharp.Tests; @@ -18,16 +18,16 @@ public class BasicSerializerTests public virtual void Deserialize(IXunitSerializationInfo info) { - info.AddValue(nameof(this.Length), this.Length); - info.AddValue(nameof(this.Name), this.Name); - info.AddValue(nameof(this.Lives), this.Lives); + this.Length = info.GetValue(nameof(this.Length)); + this.Name = info.GetValue(nameof(this.Name)); + this.Lives = info.GetValue(nameof(this.Lives)); } public virtual void Serialize(IXunitSerializationInfo info) { - this.Length = info.GetValue(nameof(this.Length)); - this.Name = info.GetValue(nameof(this.Name)); - this.Lives = info.GetValue(nameof(this.Lives)); + info.AddValue(nameof(this.Length), this.Length); + info.AddValue(nameof(this.Name), this.Name); + info.AddValue(nameof(this.Lives), this.Lives); } } @@ -37,8 +37,8 @@ public class BasicSerializerTests public override void Deserialize(IXunitSerializationInfo info) { - this.Strength = info.GetValue(nameof(this.Strength)); base.Deserialize(info); + this.Strength = info.GetValue(nameof(this.Strength)); } public override void Serialize(IXunitSerializationInfo info) @@ -51,7 +51,13 @@ public class BasicSerializerTests [Fact] public void SerializeDeserialize_ShouldPreserveValues() { - DerivedObj obj = new() { Length = 123.1, Name = "Lol123!", Lives = 7, Strength = 4.8 }; + DerivedObj obj = new() + { + Length = 123.1, + Name = "Lol123!", + Lives = 7, + Strength = 4.8, + }; string str = BasicSerializer.Serialize(obj); BaseObj mirrorBase = BasicSerializer.Deserialize(str); diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs index ee3d02670..74ad85b79 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs @@ -4,7 +4,7 @@ using System.Numerics; using System.Runtime.Intrinsics.Arm; using System.Runtime.Intrinsics.X86; -using Xunit.Abstractions; +using Xunit.Sdk; using Aes = System.Runtime.Intrinsics.X86.Aes; namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs index 349dd258e..8d57ab58e 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ImageComparerTests.cs @@ -5,7 +5,6 @@ using Moq; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs index b818e80b0..36b93b87b 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/MagickReferenceCodecTests.cs @@ -5,7 +5,6 @@ using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceDecoderBenchmarks.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceDecoderBenchmarks.cs index a145e7365..801d2e481 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceDecoderBenchmarks.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/ReferenceDecoderBenchmarks.cs @@ -4,7 +4,6 @@ using SixLabors.ImageSharp.Formats; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs index 555041890..9b20244c4 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/SystemDrawingReferenceCodecTests.cs @@ -8,7 +8,6 @@ using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Tests.TestUtilities.ImageComparison; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs index 36c078dc0..45b9d774b 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestEnvironmentTests.cs @@ -9,7 +9,6 @@ using SixLabors.ImageSharp.Formats.Gif; using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Webp; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs index 72ed27e8e..41df3544f 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestImageProviderTests.cs @@ -8,24 +8,25 @@ using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.Metadata; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Tests.TestUtilities.ReferenceCodecs; -using Xunit.Abstractions; // ReSharper disable InconsistentNaming namespace SixLabors.ImageSharp.Tests; public class TestImageProviderTests { - public static readonly TheoryData BasicData = new() - { - TestImageProvider.Blank(10, 20), - TestImageProvider.Blank(10, 20), - }; + public static readonly TheoryData BasicData = new( + new object[] + { + TestImageProvider.Blank(10, 20), + TestImageProvider.Blank(10, 20), + }); - public static readonly TheoryData FileData = new() - { - TestImageProvider.File(TestImages.Bmp.Car), - TestImageProvider.File(TestImages.Bmp.F) - }; + public static readonly TheoryData FileData = new( + new object[] + { + TestImageProvider.File(TestImages.Bmp.Car), + TestImageProvider.File(TestImages.Bmp.F), + }); public static string[] AllBmpFiles = [TestImages.Bmp.F, TestImages.Bmp.Bit8]; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs index 714dbd223..f6b1885b1 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/TestUtilityExtensionsTests.cs @@ -5,7 +5,6 @@ using System.Numerics; using SixLabors.ImageSharp.Memory; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; -using Xunit.Abstractions; namespace SixLabors.ImageSharp.Tests; diff --git a/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalDiscovererException.cs b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalDiscovererException.cs new file mode 100644 index 000000000..930708cd8 --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalDiscovererException.cs @@ -0,0 +1,12 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.DotNet.XUnitExtensions; + +internal class ConditionalDiscovererException : Exception +{ + public ConditionalDiscovererException(string message) + : base(message) + { + } +} diff --git a/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalFact.cs b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalFact.cs new file mode 100644 index 000000000..2802f75d9 --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalFact.cs @@ -0,0 +1,35 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics.CodeAnalysis; +using Microsoft.DotNet.XUnitExtensions; +using XUnit; + +namespace Xunit; + +[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] +public sealed class ConditionalFactAttribute : FactAttribute +{ + [DynamicallyAccessedMembers(StaticReflectionConstants.ConditionalMemberKinds)] + public Type CalleeType { get; private set; } + + public string[] ConditionMemberNames { get; private set; } + + public ConditionalFactAttribute( + [DynamicallyAccessedMembers(StaticReflectionConstants.ConditionalMemberKinds)] + Type calleeType, + params string[] conditionMemberNames) + { + this.CalleeType = calleeType; + this.ConditionMemberNames = conditionMemberNames; + string skipReason = ConditionalTestDiscoverer.EvaluateSkipConditions(calleeType, conditionMemberNames); + if (skipReason != null) + { + this.Skip = skipReason; + } + } + + [Obsolete( + "Use the overload that takes a Type parameter: ConditionalFact(typeof(MyClass), nameof(MyCondition)).")] + public ConditionalFactAttribute(params string[] conditionMemberNames) => this.ConditionMemberNames = conditionMemberNames; +} diff --git a/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTestDiscoverer.cs b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTestDiscoverer.cs new file mode 100644 index 000000000..3208b5a40 --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTestDiscoverer.cs @@ -0,0 +1,154 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; +using System.Linq; +using System.Reflection; +using Xunit.Sdk; + +namespace Microsoft.DotNet.XUnitExtensions; + +// Internal helper class for code common to conditional test discovery through +// [ConditionalFact] and [ConditionalTheory] +internal static class ConditionalTestDiscoverer +{ + /// + /// Evaluates skip conditions given an explicit callee type and condition member names. + /// Used by attribute constructors in xunit v3 where discoverers are not needed. + /// + internal static string EvaluateSkipConditions([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] Type calleeType, string[] conditionMemberNames) + { + if ( + calleeType == null + || conditionMemberNames == null + || conditionMemberNames.Length == 0) + { + return null; + } + + List falseConditions = new(conditionMemberNames.Length); + foreach (string entry in conditionMemberNames) + { + if (string.IsNullOrWhiteSpace(entry)) + { + continue; + } + + Func conditionFunc = LookupConditionalMember(calleeType, entry); + if (conditionFunc == null) + { + throw new ConditionalDiscovererException( + GetFailedLookupString(entry, calleeType)); + } + + try + { + if (!conditionFunc()) + { + falseConditions.Add(entry); + } + } + catch (Exception exc) + { + falseConditions.Add($"{entry} ({exc.GetType().Name})"); + } + } + + return falseConditions.Count > 0 + ? $"Condition(s) not met: \"{string.Join("\", \"", falseConditions)}\"" + : null; + } + + internal static string GetFailedLookupString(string name, Type type) => + $"An appropriate member '{name}' could not be found. " + + $"The conditional method needs to be a static method, property, or field on the type {type} or any ancestor, " + + "of any visibility, accepting zero arguments, and having a return type of Boolean."; + + internal static Func LookupConditionalMember(Type t, string name) + { + if (t == null || name == null) + { + return null; + } + + TypeInfo ti = t.GetTypeInfo(); + + MethodInfo mi = ti.GetDeclaredMethod(name); + if ( + mi != null + && mi.IsStatic + && mi.GetParameters().Length == 0 + && mi.ReturnType == typeof(bool)) + { + return () => (bool)mi.Invoke(null, null); + } + + PropertyInfo pi = ti.GetDeclaredProperty(name); + if ( + pi != null + && pi.PropertyType == typeof(bool) + && pi.GetMethod != null + && pi.GetMethod.IsStatic + && pi.GetMethod.GetParameters().Length == 0) + { + return () => (bool)pi.GetValue(null); + } + + FieldInfo fi = ti.GetDeclaredField(name); + if (fi != null && fi.FieldType == typeof(bool) && fi.IsStatic) + { + return () => (bool)fi.GetValue(null); + } + + return LookupConditionalMember(ti.BaseType, name); + } + + internal static bool CheckInputToSkipExecution( + object[] conditionArguments, + ref Type calleeType, + ref string[] conditionMemberNames, + object testMethod = null) + { + // A null or empty list of conditionArguments is treated as "no conditions". + // and the test cases will be executed. + // Example: [ConditionalClass()] + if (conditionArguments == null || conditionArguments.Length == 0) + { + return true; + } + + calleeType = conditionArguments[0] as Type; + if (calleeType != null) + { + if (conditionArguments.Length < 2) + { + // [ConditionalFact(typeof(x))] no provided methods. + return true; + } + + // [ConditionalFact(typeof(x), "MethodName")] + conditionMemberNames = conditionArguments[1] as string[]; + } + else + { + // For [ConditionalClass], unable to get the Type info. All test cases will be executed. + if (testMethod == null) + { + return true; + } + + // [ConditionalFact("MethodName")] + conditionMemberNames = conditionArguments[0] as string[]; + } + + // [ConditionalFact((string[]) null)] + if (conditionMemberNames == null || conditionMemberNames.Count() == 0) + { + return true; + } + + return false; + } +} diff --git a/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTheory.cs b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTheory.cs new file mode 100644 index 000000000..c203b481e --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/XUnit/ConditionalTheory.cs @@ -0,0 +1,33 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics.CodeAnalysis; +using Microsoft.DotNet.XUnitExtensions; + +namespace XUnit; + +[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)] +public sealed class ConditionalTheoryAttribute: TheoryAttribute +{ + [DynamicallyAccessedMembers(StaticReflectionConstants.ConditionalMemberKinds)] + public Type CalleeType { get; private set; } + + public string[] ConditionMemberNames { get; private set; } + + public ConditionalTheoryAttribute([DynamicallyAccessedMembers(StaticReflectionConstants.ConditionalMemberKinds)] Type calleeType, params string[] conditionMemberNames) + { + this.CalleeType = calleeType; + this.ConditionMemberNames = conditionMemberNames; + + string skipReason = ConditionalTestDiscoverer.EvaluateSkipConditions(calleeType, conditionMemberNames); + + if (skipReason != null) + { + this.Skip = skipReason; + } + } + + [Obsolete("Use the overload that takes a Type parameter: ConditionalTheory(typeof(MyClass), nameof(MyCondition)).")] + public ConditionalTheoryAttribute(params string[] conditionMemberNames) => this.ConditionMemberNames = conditionMemberNames; +} + diff --git a/tests/ImageSharp.Tests/TestUtilities/XUnit/StaticReflectionConstants.cs b/tests/ImageSharp.Tests/TestUtilities/XUnit/StaticReflectionConstants.cs new file mode 100644 index 000000000..8a641437f --- /dev/null +++ b/tests/ImageSharp.Tests/TestUtilities/XUnit/StaticReflectionConstants.cs @@ -0,0 +1,15 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics.CodeAnalysis; + +namespace XUnit; + +internal static class StaticReflectionConstants +{ + // ConditionalTestDiscoverer looks at all fields/methods/properties recursively. + public const DynamicallyAccessedMemberTypes ConditionalMemberKinds = + DynamicallyAccessedMemberTypes.PublicConstructors | + DynamicallyAccessedMemberTypes.PublicMethods | + DynamicallyAccessedMemberTypes.PublicProperties; +} diff --git a/tests/ImageSharp.Tests/ValidateDisposedMemoryAllocationsAttribute.cs b/tests/ImageSharp.Tests/ValidateDisposedMemoryAllocationsAttribute.cs index eca652900..07e05a759 100644 --- a/tests/ImageSharp.Tests/ValidateDisposedMemoryAllocationsAttribute.cs +++ b/tests/ImageSharp.Tests/ValidateDisposedMemoryAllocationsAttribute.cs @@ -2,7 +2,7 @@ // Licensed under the Six Labors Split License. using System.Reflection; -using Xunit.Sdk; +using Xunit.v3; namespace SixLabors.ImageSharp.Tests; @@ -19,10 +19,10 @@ public class ValidateDisposedMemoryAllocationsAttribute : BeforeAfterTestAttribu public ValidateDisposedMemoryAllocationsAttribute(int expected) => this.expected = expected; - public override void Before(MethodInfo methodUnderTest) + public override void Before(MethodInfo methodUnderTest, IXunitTest test) => MemoryAllocatorValidator.MonitorAllocations(); - public override void After(MethodInfo methodUnderTest) + public override void After(MethodInfo methodUnderTest, IXunitTest test) { MemoryAllocatorValidator.ValidateAllocations(this.expected); MemoryAllocatorValidator.StopMonitoringAllocations(); From d319780a5e14641cbf523fc8e702fcda39ea196d Mon Sep 17 00:00:00 2001 From: Stefan Nikolei Date: Thu, 20 Aug 2026 17:25:16 +0200 Subject: [PATCH 07/10] Update to XUnitv3 v4 --- shared-infrastructure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared-infrastructure b/shared-infrastructure index 131fe3e59..6949b1094 160000 --- a/shared-infrastructure +++ b/shared-infrastructure @@ -1 +1 @@ -Subproject commit 131fe3e59db92847b3d2bc8937bd35804dbcc8d5 +Subproject commit 6949b1094c3ccf672b93608f3f74a8b483426d4b From 6991206e6d5e764a27d581d9e5b980cc59ec7f5e Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 21 Aug 2026 13:28:53 +1000 Subject: [PATCH 08/10] Begin v5 --- src/ImageSharp/ImageSharp.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ImageSharp/ImageSharp.csproj b/src/ImageSharp/ImageSharp.csproj index 9f545fc2a..37759c27d 100644 --- a/src/ImageSharp/ImageSharp.csproj +++ b/src/ImageSharp/ImageSharp.csproj @@ -23,8 +23,8 @@ - - 4.0 + + 5.0 From 5db8d32a942868095cf6815da4b54a6f6dbf0b6b Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 21 Aug 2026 15:58:25 +1000 Subject: [PATCH 09/10] Retarget builds to .NET 10 and 11 Move the main target framework from net8.0 to net10.0 and the preview lane from net10.0 to net11.0, adding a global.json floor for SDK 10+ and updating CI coverage and test projects to match. The change also adjusts hardware-intrinsic feature tests for .NET 11's x86-64-v2 baseline, updates Magick.NET, adds PDF files to LFS, and converts many internal helper and codec APIs from Span to ReadOnlySpan where inputs are not mutated. --- .gitattributes | 1 + .github/workflows/build-and-test.yml | 37 +++++++------- .github/workflows/code-coverage.yml | 4 +- Directory.Build.props | 8 --- global.json | 18 +++++++ shared-infrastructure | 2 +- .../Common/Extensions/StreamExtensions.cs | 4 +- src/ImageSharp/Common/Helpers/Numerics.cs | 42 +++------------- .../Common/Helpers/SimdUtils.Shuffle.cs | 6 +-- src/ImageSharp/Common/Helpers/SimdUtils.cs | 4 +- .../Decompressors/B44ExrCompression.cs | 6 +-- .../Exr/Compression/ExrBaseDecompressor.cs | 4 +- src/ImageSharp/Formats/Exr/ExrDecoderCore.cs | 16 +++--- src/ImageSharp/Formats/Exr/ExrEncoderCore.cs | 8 +-- .../Formats/Jpeg/Components/Block8x8.cs | 4 +- .../Formats/Jpeg/Components/Block8x8F.cs | 4 +- .../Formats/Jpeg/JpegDecoderCore.cs | 6 +-- .../Formats/Jpeg/JpegEncoderCore.cs | 6 +-- src/ImageSharp/Formats/Png/PngEncoderCore.cs | 6 +-- src/ImageSharp/Formats/Tga/TgaEncoderCore.cs | 6 +-- .../Compressors/T6BitCompressor.cs | 4 +- .../Compression/Compressors/TiffLzwEncoder.cs | 6 +-- .../Formats/Tiff/TiffDecoderCore.cs | 18 +++---- .../Formats/Tiff/Writers/TiffStreamWriter.cs | 4 +- src/ImageSharp/Formats/Webp/AlphaDecoder.cs | 12 ++--- .../Formats/Webp/BitWriter/BitWriterBase.cs | 4 +- .../Formats/Webp/BitWriter/Vp8BitWriter.cs | 4 +- .../Webp/Lossless/BackwardReferenceEncoder.cs | 4 +- .../Webp/Lossless/ColorSpaceTransformUtils.cs | 6 +-- .../Formats/Webp/Lossless/CostModel.cs | 2 +- .../Formats/Webp/Lossless/HistogramEncoder.cs | 2 +- .../Formats/Webp/Lossless/HuffmanUtils.cs | 8 +-- .../Formats/Webp/Lossless/LosslessUtils.cs | 4 +- .../Formats/Webp/Lossless/NearLosslessEnc.cs | 2 +- .../Formats/Webp/Lossless/PredictorEncoder.cs | 10 ++-- .../Formats/Webp/Lossless/Vp8LBitEntropy.cs | 8 +-- .../Formats/Webp/Lossless/Vp8LEncoder.cs | 16 +++--- .../Formats/Webp/Lossless/Vp8LHistogram.cs | 10 ++-- .../Webp/Lossless/WebpLosslessDecoder.cs | 4 +- .../Formats/Webp/Lossy/LossyUtils.cs | 50 +++++++++---------- .../Formats/Webp/Lossy/Vp8EncIterator.cs | 2 +- .../Formats/Webp/Lossy/Vp8EncProba.cs | 2 +- .../Formats/Webp/Lossy/Vp8Encoding.cs | 28 +++++------ .../Formats/Webp/Lossy/Vp8Residual.cs | 2 +- .../Formats/Webp/Lossy/Vp8SegmentInfo.cs | 2 +- .../Formats/Webp/Lossy/YuvConversion.cs | 10 ++-- src/ImageSharp/ImageSharp.csproj | 4 +- .../PixelFormats/PixelOperations{TPixel}.cs | 2 +- tests/Directory.Build.targets | 2 +- .../ImageSharp.Benchmarks.csproj | 4 +- .../ImageSharp.PublicApi.Tests.csproj | 4 +- .../ImageSharp.Tests.ProfilingSandbox.csproj | 4 +- .../ImageSharp.Tests/ImageSharp.Tests.csproj | 4 +- .../FeatureTesting/FeatureTestRunner.cs | 7 +++ .../Tests/FeatureTestRunnerTests.cs | 28 ++++++----- 55 files changed, 235 insertions(+), 240 deletions(-) create mode 100644 global.json diff --git a/.gitattributes b/.gitattributes index 031420e53..a0643702b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -110,6 +110,7 @@ ############################################################################### # Handle image files by git lfs ############################################################################### +*.pdf filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text *.jpeg filter=lfs diff=lfs merge=lfs -text *.bmp filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 634b904ae..bb0962784 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -64,48 +64,48 @@ jobs: matrix: options: - os: ubuntu-latest - framework: net10.0 - sdk: 10.0.x + framework: net11.0 + sdk: 11.0.x sdk-preview: true runtime: -x64 codecov: false - os: macos-26 - framework: net10.0 - sdk: 10.0.x + framework: net11.0 + sdk: 11.0.x sdk-preview: true runtime: -x64 codecov: false - os: windows-latest - framework: net10.0 - sdk: 10.0.x + framework: net11.0 + sdk: 11.0.x sdk-preview: true runtime: -x64 codecov: false - os: ubuntu-22.04-arm - framework: net10.0 - sdk: 10.0.x + framework: net11.0 + sdk: 11.0.x sdk-preview: true runtime: -x64 codecov: false - os: ubuntu-latest - framework: net8.0 - sdk: 8.0.x + framework: net10.0 + sdk: 10.0.x runtime: -x64 codecov: false - os: macos-26 - framework: net8.0 - sdk: 8.0.x + framework: net10.0 + sdk: 10.0.x runtime: -x64 codecov: false - os: windows-latest - framework: net8.0 - sdk: 8.0.x + framework: net10.0 + sdk: 10.0.x runtime: -x64 codecov: false - os: ubuntu-22.04-arm - framework: net8.0 - sdk: 8.0.x + framework: net10.0 + sdk: 10.0.x runtime: -x64 codecov: false @@ -169,14 +169,15 @@ jobs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x + 10.0.x - name: DotNet Setup Preview if: ${{ matrix.options.sdk-preview == true }} uses: actions/setup-dotnet@v6 with: + dotnet-quality: preview dotnet-version: | - 10.0.x + 11.0.x - name: DotNet Build if: ${{ matrix.options.sdk-preview != true }} diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index 00f489b40..eca2f190f 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -11,7 +11,7 @@ jobs: matrix: options: - os: ubuntu-latest - framework: net8.0 + framework: net10.0 runtime: -x64 codecov: true @@ -70,7 +70,7 @@ jobs: uses: actions/setup-dotnet@v6 with: dotnet-version: | - 8.0.x + 10.0.x - name: DotNet Build shell: pwsh diff --git a/Directory.Build.props b/Directory.Build.props index 9bda76f88..ab898020c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -21,14 +21,6 @@ - - 12.0 - - - - 14.0 - - - + diff --git a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj index 0351ecae9..e060e1f33 100644 --- a/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj +++ b/tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj @@ -39,12 +39,12 @@ - net8.0;net10.0 + net10.0;net11.0 - net8.0 + net10.0 diff --git a/tests/ImageSharp.PublicApi.Tests/ImageSharp.PublicApi.Tests.csproj b/tests/ImageSharp.PublicApi.Tests/ImageSharp.PublicApi.Tests.csproj index 33bbc1b94..bab8095c5 100644 --- a/tests/ImageSharp.PublicApi.Tests/ImageSharp.PublicApi.Tests.csproj +++ b/tests/ImageSharp.PublicApi.Tests/ImageSharp.PublicApi.Tests.csproj @@ -10,12 +10,12 @@ - net8.0;net10.0 + net10.0;net11.0 - net8.0 + net10.0 diff --git a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj index f3aa910b9..658e32999 100644 --- a/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj +++ b/tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj @@ -18,12 +18,12 @@ - net8.0;net10.0 + net10.0;net11.0 - net8.0 + net10.0 diff --git a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj index 25d30b514..9c9ee8da6 100644 --- a/tests/ImageSharp.Tests/ImageSharp.Tests.csproj +++ b/tests/ImageSharp.Tests/ImageSharp.Tests.csproj @@ -12,12 +12,12 @@ - net8.0;net10.0 + net10.0;net11.0 - net8.0 + net10.0 diff --git a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs index bbe5f221a..d0b77882d 100644 --- a/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs +++ b/tests/ImageSharp.Tests/TestUtilities/FeatureTesting/FeatureTestRunner.cs @@ -414,7 +414,14 @@ public static class FeatureTestRunner // Not a COMPlus value. We filter in calling method. features.Add(key, nameof(HwIntrinsics.AllowAll)); break; +#if NET11_0_OR_GREATER + case nameof(HwIntrinsics.DisableSSE42): + // SSE3 through SSE4.2 and POPCNT are x86-64-v2 baseline in .NET 11+ and the + // switch is inert, so skip it entirely rather than spawn a child that tests nothing. + // https://learn.microsoft.com/en-us/dotnet/core/compatibility/jit/11/minimum-hardware-requirements + break; +#endif default: features.Add(key, intrinsic.Replace("Disable", "Enable")); break; diff --git a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs index 74ad85b79..8b9210636 100644 --- a/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs +++ b/tests/ImageSharp.Tests/TestUtilities/Tests/FeatureTestRunnerTests.cs @@ -11,20 +11,25 @@ namespace SixLabors.ImageSharp.Tests.TestUtilities.Tests; public class FeatureTestRunnerTests { - public static TheoryData Intrinsics => + public static TheoryData Intrinsics => new() { - { HwIntrinsics.DisableAES | HwIntrinsics.AllowAll, ["EnableAES", "AllowAll"] }, - { HwIntrinsics.DisableHWIntrinsic, ["EnableHWIntrinsic"] }, - { HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, ["EnableSSE42", "EnableAVX"] } + { HwIntrinsics.DisableAES | HwIntrinsics.AllowAll, HwIntrinsics.DisableAES | HwIntrinsics.AllowAll, ["EnableAES", "AllowAll"] }, + { HwIntrinsics.DisableHWIntrinsic, HwIntrinsics.DisableHWIntrinsic, ["EnableHWIntrinsic"] }, +#if NET11_0_OR_GREATER + // ToFeatureKeyValueCollection filters DisableSSE42: SSE4.2 is x86-64-v2 baseline in .NET 11+ and cannot be disabled. + { HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, HwIntrinsics.DisableAVX, ["EnableAVX"] } +#else + { HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, HwIntrinsics.DisableSSE42 | HwIntrinsics.DisableAVX, ["EnableSSE42", "EnableAVX"] } +#endif }; [Theory] [MemberData(nameof(Intrinsics))] - public void ToFeatureCollectionReturnsExpectedResult(HwIntrinsics expectedIntrinsics, string[] expectedValues) + public void ToFeatureCollectionReturnsExpectedResult(HwIntrinsics intrinsics, HwIntrinsics expectedIntrinsics, string[] expectedValues) { - Dictionary features = expectedIntrinsics.ToFeatureKeyValueCollection(); - HwIntrinsics[] keys = features.Keys.ToArray(); + Dictionary features = intrinsics.ToFeatureKeyValueCollection(); + HwIntrinsics[] keys = [.. features.Keys]; HwIntrinsics actualIntrinsics = keys[0]; for (int i = 1; i < keys.Length; i++) @@ -122,9 +127,8 @@ public class FeatureTestRunnerTests Assert.False(Ssse3.IsSupported, "Ssse3 should be disabled."); Assert.False(Sse41.IsSupported, "Sse41 should be disabled."); Assert.False(Popcnt.IsSupported, "Popcnt should be disabled."); -#else - Assert.False(Sse42.IsSupported, "Sse42 should be disabled when DisableSSE42 is set."); #endif + Assert.False(Sse42.IsSupported, "Sse42 should be disabled when DisableSSE42 is set."); break; case HwIntrinsics.DisableAVX: Assert.False(Avx.IsSupported, "AVX should be disabled when DisableAVX is set."); @@ -169,12 +173,12 @@ public class FeatureTestRunnerTests { Assert.NotNull(serializable); Assert.NotNull(FeatureTestRunner.DeserializeForXunit(serializable)); - Assert.False(Sse42.IsSupported, "SSE42 should be disabled when DisableSSE42 is set (sanity check using serializable param overload)."); + Assert.False(Avx.IsSupported, "AVX should be disabled when DisableAVX is set (sanity check using serializable param overload)."); } FeatureTestRunner.RunWithHwIntrinsicsFeature( AssertHwIntrinsicsFeatureDisabled, - HwIntrinsics.DisableSSE42, + HwIntrinsics.DisableAVX, new FakeSerializable()); } @@ -256,7 +260,7 @@ public class FeatureTestRunnerTests } } - foreach (HwIntrinsics intrinsic in (HwIntrinsics[])Enum.GetValues(typeof(HwIntrinsics))) + foreach (HwIntrinsics intrinsic in Enum.GetValues()) { FeatureTestRunner.RunWithHwIntrinsicsFeature(AssertHwIntrinsicsFeatureDisabled, intrinsic, new FakeSerializable()); } From 06283b71642d7ab655df287a006826e5b594f4b6 Mon Sep 17 00:00:00 2001 From: James Jackson-South Date: Fri, 21 Aug 2026 21:38:43 +1000 Subject: [PATCH 10/10] Fix IsAsync expectations for .NET 11 on Unix FileStream.IsAsync is now false for regular files on Unix. See https://github.com/dotnet/runtime/pull/125220 --- tests/ImageSharp.Tests/IO/LocalFileSystemTests.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/ImageSharp.Tests/IO/LocalFileSystemTests.cs b/tests/ImageSharp.Tests/IO/LocalFileSystemTests.cs index a1eeb2597..56864680d 100644 --- a/tests/ImageSharp.Tests/IO/LocalFileSystemTests.cs +++ b/tests/ImageSharp.Tests/IO/LocalFileSystemTests.cs @@ -50,7 +50,12 @@ public class LocalFileSystemTests await using (FileStream stream = (FileStream)fs.OpenReadAsynchronous(path)) using (StreamReader reader = new(stream)) { + // .NET 11 reports IsAsync false for regular files on Unix: https://github.com/dotnet/runtime/pull/125220 +#if NET11_0_OR_GREATER + Assert.Equal(OperatingSystem.IsWindows(), stream.IsAsync); +#else Assert.True(stream.IsAsync); +#endif Assert.True(stream.CanRead); Assert.False(stream.CanWrite); @@ -105,7 +110,12 @@ public class LocalFileSystemTests await using (FileStream stream = (FileStream)fs.CreateAsynchronous(path)) await using (StreamWriter writer = new(stream)) { + // .NET 11 reports IsAsync false for regular files on Unix: https://github.com/dotnet/runtime/pull/125220 +#if NET11_0_OR_GREATER + Assert.Equal(OperatingSystem.IsWindows(), stream.IsAsync); +#else Assert.True(stream.IsAsync); +#endif Assert.True(stream.CanRead); Assert.True(stream.CanWrite);