Update to xunit.v3 #20331

Youssef1313 · 2025-12-22T11:51:29Z

What does the pull request do?

Updates tests to run with xunit.v3 (when possible) and Microsoft.Testing.Platform v2. NUnit headless tests are still xunit 2.

What is the current behavior?

Tests are run with xunit 2 and VSTest.

What is the updated/expected behavior with this PR?

Test-infra changes only. This is a modernization of the test infra to use the latest and greatest tools available.

How was the solution implemented (if it's not obvious)?

Use xunit.v3.mtp-v2 NuGet package and make necessary infra changes to support it.

Checklist

Added unit tests (if possible)?
Added XML documentation to any related classes?
Consider submitting a PR to https://github.com/AvaloniaUI/avalonia-docs with user documentation

Breaking changes

Obsoletions / Deprecations

Fixed issues

...s/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj

nukebuild/Build.cs

avaloniaui-bot · 2025-12-25T09:53:49Z

You can test this PR using the following package version. 12.0.999-cibuild0061095-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

avaloniaui-bot · 2025-12-27T13:57:19Z

You can test this PR using the following package version. 12.0.999-cibuild0061107-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

Youssef1313 · 2025-12-30T19:31:23Z

@maxkatz6 Can you please review this? Thanks!

build/XUnit.props

avaloniaui-bot · 2025-12-30T20:27:08Z

You can test this PR using the following package version. 12.0.999-cibuild0061165-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

avaloniaui-bot · 2025-12-30T21:38:45Z

You can test this PR using the following package version. 12.0.999-cibuild0061168-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

avaloniaui-bot · 2025-12-31T11:54:29Z

You can test this PR using the following package version. 12.0.999-cibuild0061175-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

MrJul · 2026-01-05T11:43:34Z

build/XUnit.props

-    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
-    <PackageReference Include="Xunit.SkippableFact" Version="1.5.23" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="YTest.MTP.XUnit2" Version="1.0.2" />


I'm not sure we want to reference a third party package just for enabling xUnit 2 with MTP here. Especially since we're going to update our headless packages to xUnit 3 anyway.

cc @maxkatz6

@MrJul What's the concern of referencing a "third party" package? Xunit.SkippableFact is also a third party package.

This is going to be temporary anyways until the next Avalonia major if next major will drop XUnit 2.

It's just adding an extra layer that we have to maintain: while nice, we don't really need xUnit 2 support on MTP. If something goes wrong for any reason, there will be absolutely no support here. (I'm aware that you're the package author.)

Since it's temporary anyway, this is indeed less of a concern, but I still fail to see the immediate benefit instead of running our old xUnit 2 tests "the old way" :)

It creates a lot of hassle to mix VSTest and Microsoft.Testing.Platform in the same solution and is not supported.

Assuming YTest.MTP.XUnit2 is not a transitive dependency of any of Avalonia packages, it should be fine as an intermediate step.

@maxkatz6 Yes. It's not going to be a dependency of any Avalonia packages. In that case, this PR is ready to merge on its current state?

Not with the added warnings, but otherwise yes.

Sure thing. I'll fix the warnings.

MrJul · 2026-01-05T11:58:26Z

Note: a lot of new warnings coming from xUnit analyzers are generated by this upgrade.
I've been working on removing almost all warnings lately, it would be nice not to introduce new ones :)

Youssef1313 · 2026-01-05T12:01:32Z

Note: a lot of new warnings coming from xUnit analyzers are generated by this upgrade. I've been working on removing almost all warnings lately, it would be nice not to introduce new ones :)

I think you should really work on getting clean builds and enable warnings as errors in CI.

MrJul · 2026-01-05T12:09:29Z

I think you should really work on getting clean builds and enable warnings as errors in CI.

I agree, and that's exactly what I am working on.

#20312 solves the analyzer warnings.
After that, we only have a handful of obsolete warnings remaining (bindings, iOS, Android) that will be handled in separate PRs.
Warnings as errors will be enabled after that. Meanwhile, please don't introduce new ones.

Youssef1313 · 2026-01-05T12:14:42Z

Sure, I'll work on the newly introduced warnings. But we need to first align on how to handle XUnit 2. Related question: is master now building 12.x packages? So I can actually update everything to xunit.v3 in this PR?

MrJul · 2026-01-05T16:20:19Z

Related question: is master now building 12.x packages?

Yes, master has been building 12.x packages for a while now.

So I can actually update everything to xunit.v3 in this PR?

While we should be able to update everything in this PR, I know that the underlying xUnit runner API has changed a bit and our headless infrastructure for this framework might need a rework. If that's the case, that kind of work would probably be better done in another PR, to keep things contained.

avaloniaui-bot · 2026-01-07T13:05:52Z

You can test this PR using the following package version. 12.0.999-cibuild0061279-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

avaloniaui-bot · 2026-01-07T13:59:54Z

You can test this PR using the following package version. 12.0.999-cibuild0061285-alpha. (feed url: https://nuget-feed-all.avaloniaui.net/v3/index.json) [PRBUILDID]

Youssef1313 · 2026-01-07T14:25:23Z

@MrJul @maxkatz6 Warnings are addressed now.

Youssef1313 force-pushed the xunit-v3 branch 8 times, most recently from d68fac2 to 00c2c31 Compare December 22, 2025 15:20

Update to xunit.v3

1eee916

Youssef1313 force-pushed the xunit-v3 branch from 00c2c31 to 1eee916 Compare December 22, 2025 15:30

maxkatz6 reviewed Dec 23, 2025

View reviewed changes

...s/Avalonia.Headless.XUnit.PerTest.UnitTests/Avalonia.Headless.XUnit.PerTest.UnitTests.csproj Show resolved Hide resolved

Youssef1313 added 3 commits December 23, 2025 09:39

Little more progress

ae93d92

More fixes

fda3bc4

Keep VSTest supported

2621023

Youssef1313 commented Dec 23, 2025

View reviewed changes

nukebuild/Build.cs Outdated Show resolved Hide resolved

Youssef1313 added 15 commits December 23, 2025 10:35

Adjust Nuke

57338ac

Few fixes

ecaa0f2

Fix for xunit 2

47120e5

Fix GetData override

e1c6510

Adjust

62cac8d

Use MTP for xunit 2

7430263

Fix test

1e0cc63

Better fix

b017d96

--no-progress

3732863

Few more fixes

959d628

no progress

787ad30

Fix test

bcb1eac

Better fix

3a22633

TRX

d32da1f

Move to Directory.Build.props

1a1a786

Unify on MTP v2

d2ce877

Youssef1313 marked this pull request as ready for review December 25, 2025 09:48

Youssef1313 requested a review from maxkatz6 December 25, 2025 09:48

Update

b317d9e

Youssef1313 commented Dec 30, 2025

View reviewed changes

build/XUnit.props Outdated Show resolved Hide resolved

Update to stable

f6c3497

1.0.1

255d252

1.0.2

6d62e25

MrJul mentioned this pull request Jan 5, 2026

Update dependencies and test packages #20404

Closed

3 tasks

MrJul added enhancement wont-backport labels Jan 5, 2026

MrJul reviewed Jan 5, 2026

View reviewed changes

Youssef1313 added 2 commits January 7, 2026 13:59

Merge branch 'master' into xunit-v3

b457e9e

Fix some warnings

59c2dfb

Youssef1313 added 2 commits January 7, 2026 14:17

Fix more warnings

d333b48

Fix more warnings

a1e56f4

Uh oh!

Update to xunit.v3 #20331

Are you sure you want to change the base?

Update to xunit.v3 #20331

Conversation

Youssef1313 commented Dec 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does the pull request do?

What is the current behavior?

What is the updated/expected behavior with this PR?

How was the solution implemented (if it's not obvious)?

Checklist

Breaking changes

Obsoletions / Deprecations

Fixed issues

Uh oh!

Uh oh!

Uh oh!

avaloniaui-bot commented Dec 25, 2025

Uh oh!

avaloniaui-bot commented Dec 27, 2025

Uh oh!

Youssef1313 commented Dec 30, 2025

Uh oh!

Uh oh!

avaloniaui-bot commented Dec 30, 2025

Uh oh!

avaloniaui-bot commented Dec 30, 2025

Uh oh!

avaloniaui-bot commented Dec 31, 2025

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!

MrJul commented Jan 5, 2026

Uh oh!

Youssef1313 commented Jan 5, 2026

Uh oh!

MrJul commented Jan 5, 2026

Uh oh!

Youssef1313 commented Jan 5, 2026

Uh oh!

MrJul commented Jan 5, 2026

Uh oh!

avaloniaui-bot commented Jan 7, 2026

Uh oh!

avaloniaui-bot commented Jan 7, 2026

Uh oh!

Youssef1313 commented Jan 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Youssef1313 commented Dec 22, 2025 •

edited

Loading