Update SharedInfrastructure for Xunit V3 by stefannikolei · Pull Request #2854 · SixLabors/ImageSharp

stefannikolei · 2024-12-21T19:07:26Z

Submodule points to my fork for iterating faster. When this works, I will create a mr in the SharedInfrastructure project

stefannikolei · 2024-12-21T20:50:57Z

I started looking into it.

Gonna take longer. This is not a small change.

# Conflicts: # shared-infrastructure

JimBobSquarePants · 2026-05-21T14:57:57Z

You’re a brave man! XUnit versioning is a shambles.

stefannikolei · 2026-05-21T15:09:59Z

@JimBobSquarePants Just small changes then it should work.

But those changes are 🤮

Will have to clean it up. I just saw that there are some unrelated changes.

Breaking changes addressed: - Update xunit.v3 to 3.2.2 and xunit.runner.visualstudio to 3.1.5 - Remove Microsoft.DotNet.XUnitExtensions (conflicts with xunit.v3 via xunit.core v2) - Replace ConditionalFact/ConditionalTheory with Fact/Theory SkipUnless/SkipWhen/SkipType - Remove 'using Xunit.Abstractions' (ITestOutputHelper now in Xunit namespace globally) - Fix TestFrameworkAttribute: string args → typeof(T) form - Fix XunitTestFramework ctor: no longer takes IMessageSink - Fix BeforeAfterTestAttribute Before/After: added IXunitTest parameter, use Xunit.v3 ns - Fix DataAttribute: new GetData signature (DisposalTracker), add SupportsDiscoveryEnumeration() - Fix IXunitSerializable/IXunitSerializationInfo: add 'using Xunit.Sdk' to all consumers - Fix BasicSerializer: implement new IXunitSerializationInfo.GetValue(string) returning object? Store type info in dump format (key:TypeAQN:value) to enable typed reconstruction - Fix TheoryData<T> CS0121 ambiguity on C# 12/net8.0: add explicit casts (T)value Affects ExifValuesTests, PixelOperationsTests, QuantizerTests, DitherTests, TestImageProviderTests, RotateTests, L8Tests, La16Tests - Fix PngEncoderTests: TheoryData<T> now yields TheoryDataRow<T>, not object[]

when used in nameof it is not allowed to be a filed it must be a property

stefannikolei · 2026-05-21T19:25:29Z

@JimBobSquarePants so i finale succeeded. If you want you can have a look

JimBobSquarePants · 2026-05-26T04:12:34Z


        // TODO: Figure out cancellation failures on Linux
-        [ConditionalTheory(typeof(TestEnvironment), nameof(TestEnvironment.IsWindows))]
+        [Theory(Skip = "Skipped on non-Windows platforms", SkipType = typeof(TestEnvironment), SkipUnless = nameof(TestEnvironment.IsWindows))]


[ConditionalTheory] comes from Arcade doesn't it. Can we write our own version? Seems less verbose.

I can look into it. Arcade is strange. You use a package which is not findable on Nuget

Yeah it’s from a runtime feed we add via the submodule. Has RemoteExecutor also.

I can add it. Where would you want me to put it? TestUtilities.XUnit.Attributes ?

JimBobSquarePants · 2026-05-26T04:24:10Z

        {
-            string[] kv = s.Split(Separator);
-            this.map[kv[0]] = kv[1];
+            // Format: key:TypeAQN:value  (3 parts max to preserve ':' inside value)


I'll need you to explain all this I'm afraid.

The old interface did pass the type in the Get. That's why it was saved internally as key:value.

With XunitV3 we do not get that info with the get method that's why we now save it in the dictionary. So we now have 3 parts and not 3 parts like before

Source of it: https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.XUnitExtensions.Shared/Attributes

JimBobSquarePants · 2026-06-11T01:45:49Z

                GCMemoryInfo memInfo = GC.GetGCMemoryInfo();
                int highLoadThreshold = (int)(memInfo.HighMemoryLoadThresholdBytes / oneMb);
-                highLoadThreshold = (int)(trimSettings.HighPressureThresholdRate * highLoadThreshold);
+                highLoadThreshold = (int)(


Formatting like this is weird. Can you please look in the diff for other odd changes like this and revert. I've spotted a few.

JimBobSquarePants · 2026-06-11T01:46:26Z

 {
    public static readonly TheoryData<byte> LuminanceData
-        = new() { 0, 1, 2, 3, 5, 13, 31, 71, 73, 79, 83, 109, 127, 128, 131, 199, 250, 251, 254, 255 };
+        = new() { (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 };


And we definitely need this new casting?

Do you see another way?

better than this

Does casting the first entry work? (byte)0

Like this?

nope ...

🤮

Oh XUnit!

JimBobSquarePants · 2026-06-11T01:46:45Z

-        new WebSafePaletteQuantizer(OrderedDitherOptions),
-        new WernerPaletteQuantizer(OrderedDitherOptions),
-        new WuQuantizer(OrderedDitherOptions)
+        (IQuantizer)KnownQuantizers.Hexadecatree,


Same here. Lots of new casting

JimBobSquarePants · 2026-06-11T01:47:25Z

                    {
-                        addedRows = memberItems.Select(x => new[] { x });
-                    }
+                        if (x is ITheoryDataRow row) return row.GetData();


There should be an editorconfig setting for this.

Another thing is formatting.

Should we work onto an ci check and tooling that formats the code? Or do you want it handcrafted.

I made good experience with csharpier. It's opinionated. At first a bit strange but after getting used to it 👌 and no more formatting discussions or problems

Should we work onto an ci check and tooling that formats the code? Or do you want it handcrafted.

No. I do not want to ever rely on automation for code formatting. I want people to be aware of the styles and standards.

There should be an editorconfig setting for this.

csharp_prefer_braces is already present as a warning. We just don't have them as errors in the tests.

JimBobSquarePants · 2026-06-11T01:48:13Z

    [Fact]
-    public void SolutionDirectoryFullPath()
-        => this.CheckPath(TestEnvironment.SolutionDirectoryFullPath);
+    public void SolutionDirectoryFullPath() =>


Odd formatting changes

JimBobSquarePants · 2026-06-11T01:48:24Z

    public void GetReferenceOutputFileName()
    {
-        string actual = Path.Combine(TestEnvironment.ActualOutputDirectoryFullPath, @"foo\bar\lol.jpeg");
+        string actual = Path.Combine(


No need to wrap here.

JimBobSquarePants · 2026-06-11T01:48:41Z

    [InlineData("lol/Baz.gif", typeof(GifDecoder))]
    [InlineData("lol/foobar.webp", typeof(WebpDecoder))]
-    public void GetReferenceDecoder_ReturnsCorrectDecoders_Windows(string fileName, Type expectedDecoderType)
+    public void GetReferenceDecoder_ReturnsCorrectDecoders_Windows(


No here etc.

JimBobSquarePants · 2026-06-11T01:49:26Z

+            CalleeType = calleeType;
+            ConditionMemberNames = conditionMemberNames;
+            string skipReason = ConditionalTestDiscoverer.EvaluateSkipConditions(calleeType, conditionMemberNames);
+            if (skipReason != null)


JimBobSquarePants · 2026-06-11T01:49:35Z

+                Skip = skipReason;
+        }
+
+        [Obsolete(


odd wrapping

JimBobSquarePants · 2026-06-11T01:49:44Z

+            List<string> falseConditions = new(conditionMemberNames.Length);
+            foreach (string entry in conditionMemberNames)
+            {
+                if (string.IsNullOrWhiteSpace(entry))


JimBobSquarePants · 2026-06-11T01:50:05Z

+                conditionMemberNames
+            );
+            if (skipReason != null)
+                Skip = skipReason;


JimBobSquarePants · 2026-06-11T01:50:12Z

+                Skip = skipReason;
+        }
+
+        [Obsolete(


odd wrapping

JimBobSquarePants · 2026-06-11T01:51:25Z

+        public DynamicallyAccessedMemberTypes MemberTypes { get; }
+    }
+
+    internal enum DynamicallyAccessedMemberTypes


This should be available to you without copying.

https://learn.microsoft.com/en-us/dotnet/api/system.diagnostics.codeanalysis.dynamicallyaccessedmembertypes?view=net-8.0

JimBobSquarePants · 2026-06-11T01:51:50Z

            if (directory == null)
            {
-                throw new DirectoryNotFoundException($"Unable to find ImageSharp solution directory from {TestAssemblyFile}!");
+                throw new DirectoryNotFoundException(


unnecessary wrapping

JimBobSquarePants · 2026-06-11T01:52:12Z

                    $"Unable to find ImageSharp solution directory from {TestAssemblyFile} because of {ex.GetType().Name}!",
-                    ex);
+                    ex
+                );


I've seen this change in a few places now and it violates StyleCop

JimBobSquarePants · 2026-06-11T01:52:33Z

    internal static bool IsMono => Type.GetType("Mono.Runtime") != null; // https://stackoverflow.com/a/721194

-    internal static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+    public static bool IsWindows => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);


Why is this public and no others?

This was needed for using plain fact. This can probably switched back to internal

JimBobSquarePants · 2026-06-11T01:52:52Z


-        string remoteExecutorConfigPath =
-            Path.Combine(TestAssemblyFile.DirectoryName, "Microsoft.DotNet.RemoteExecutor.exe.config");
+        string remoteExecutorConfigPath = Path.Combine(


More new wrapping

Update SharedInfrastructure for Xunit V3

29ff145

# Conflicts: # shared-infrastructure

stefannikolei force-pushed the sn/upd/xunit branch from 1bb255f to 29ff145 Compare May 20, 2026 19:43

stefannikolei added 3 commits May 21, 2026 19:10

Fix xunit.v3 test failures post-migration

34f44a6

Update shared-infra

d50cba9

stefannikolei force-pushed the sn/upd/xunit branch from 1113a0f to d50cba9 Compare May 21, 2026 17:11

Fix xunit skip

29ff120

when used in nameof it is not allowed to be a filed it must be a property

stefannikolei force-pushed the sn/upd/xunit branch from 1233a91 to 29ff120 Compare May 21, 2026 18:46

stefannikolei marked this pull request as ready for review May 21, 2026 19:25

JimBobSquarePants reviewed May 26, 2026

View reviewed changes

Comment thread tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs Outdated

JimBobSquarePants reviewed May 26, 2026

View reviewed changes

Comment thread tests/ImageSharp.Tests/PixelFormats/PixelOperations/PixelOperationsTests.cs Outdated

JimBobSquarePants reviewed May 26, 2026

View reviewed changes

stefannikolei added 2 commits May 28, 2026 11:00

Remove legacy way in BasicSerializer

d274dce

Remove cast to object

7e89cf2

stefannikolei force-pushed the sn/upd/xunit branch from fac4787 to 7e89cf2 Compare May 28, 2026 12:24

Port ConditionalTheory and Fact

3a434f7

Source of it: https://github.com/dotnet/arcade/tree/main/src/Microsoft.DotNet.XUnitExtensions.Shared/Attributes

stefannikolei force-pushed the sn/upd/xunit branch from f6d32f8 to 3a434f7 Compare May 30, 2026 12:33

Merge branch 'main' into sn/upd/xunit

5a1aa3f

JimBobSquarePants reviewed Jun 11, 2026

View reviewed changes

Comment thread tests/ImageSharp.Tests/Memory/Allocators/UniformUnmanagedMemoryPoolTests.Trim.cs

JimBobSquarePants reviewed Jun 11, 2026

View reviewed changes

Uh oh!

Conversation

stefannikolei commented Dec 21, 2024

Uh oh!

stefannikolei commented Dec 21, 2024

Uh oh!

JimBobSquarePants commented May 21, 2026

Uh oh!

stefannikolei commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stefannikolei commented May 21, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

stefannikolei commented May 21, 2026 •

edited

Loading