From 83ed880e4471344deaf008da9bd028c7e170bdc7 Mon Sep 17 00:00:00 2001
From: Joseph Doherty <dohejw01@gmail.com>
Date: Tue, 10 Nov 2026 09:31:30 -0500
Subject: [PATCH] build: bump xunit.v3 to 3.2.2 repo-wide, drop the four
 VersionOverrides (#795)

Central pin 1.1.0 -> 3.2.2; AdminUI/ControlPlane/Runtime/Host.Tests no longer carry VersionOverride.
The three driver IntegrationTests fixtures' Fact/Theory attributes gain the source-info ctor (xUnit3003).
No xUnit1051 fallout remained (already cleaned). Test counts unchanged.

Claude-Session: https://claude.ai/code/session_01GT67AEHd2Acv1YPwGfXEoV
---
 Directory.Packages.props                               |  7 +++----
 .../AbServerFixture.cs                                 | 10 ++++++++--
 .../AbLegacyServerFixture.cs                           | 10 ++++++++--
 .../TwinCATXarFixture.cs                               | 10 ++++++++--
 .../ZB.MOM.WW.OtOpcUa.AdminUI.Tests.csproj             |  2 +-
 .../ZB.MOM.WW.OtOpcUa.ControlPlane.Tests.csproj        |  2 +-
 .../ZB.MOM.WW.OtOpcUa.Host.Tests.csproj                |  2 +-
 .../ZB.MOM.WW.OtOpcUa.Runtime.Tests.csproj             |  2 +-
 8 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 27299540..0ec4d534 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -213,10 +213,9 @@
          Applied via a direct PackageReference in the consuming desktop project(s). -->
     <PackageVersion Include="Tmds.DBus.Protocol" Version="0.21.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2" />
-    <!-- Akka.TestKit.Xunit 1.5.62 (the xunit.v3 TestKit) requires xunit.v3.assert / extensibility.core >= 3.2.2, so
-         the 4 Akka TestKit test projects (AdminUI/ControlPlane/Runtime/Host.Tests) carry VersionOverride="3.2.2".
-         Move this pin to 3.2.2 repo-wide (and drop the overrides) once the other projects' analyzer fallout is handled. -->
-    <PackageVersion Include="xunit.v3" Version="1.1.0" />
+    <!-- xunit.v3 3.2.2 repo-wide: Akka.TestKit.Xunit 1.5.62 (the xunit.v3 TestKit) requires xunit.v3.assert /
+         extensibility.core >= 3.2.2 (#756, #795). No per-project VersionOverride. -->
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="ZB.MOM.WW.Health" Version="0.3.0" />
     <!--
       LocalDb: embedded SQLite node-local cache + optional 2-node gRPC replication. The core
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs
index f9b23d61..7b8ec2c3 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbCip.IntegrationTests/AbServerFixture.cs
@@ -100,7 +100,10 @@ public sealed class AbServerFixture : IAsyncLifetime
 public sealed class AbServerFactAttribute : FactAttribute
 {
     /// <summary>Initializes a new instance of the AbServerFactAttribute class.</summary>
-    public AbServerFactAttribute()
+    public AbServerFactAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!AbServerFixture.IsServerAvailable())
             Skip = "ab_server not reachable. Start the Docker container " +
@@ -118,7 +121,10 @@ public sealed class AbServerFactAttribute : FactAttribute
 public sealed class AbServerTheoryAttribute : TheoryAttribute
 {
     /// <summary>Initializes a new instance of the AbServerTheoryAttribute class.</summary>
-    public AbServerTheoryAttribute()
+    public AbServerTheoryAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!AbServerFixture.IsServerAvailable())
             Skip = "ab_server not reachable. Start the Docker container " +
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs
index f0a5a347..93c22e7b 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.AbLegacy.IntegrationTests/AbLegacyServerFixture.cs
@@ -239,7 +239,10 @@ public sealed class AbLegacyServerCollection : Xunit.ICollectionFixture<AbLegacy
 public sealed class AbLegacyFactAttribute : FactAttribute
 {
     /// <summary>Initializes the attribute, skipping the test if the server is unavailable.</summary>
-    public AbLegacyFactAttribute()
+    public AbLegacyFactAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!AbLegacyServerFixture.IsServerAvailable())
             Skip = "AB Legacy PCCC endpoint not reachable. Start the Docker fixture " +
@@ -254,7 +257,10 @@ public sealed class AbLegacyFactAttribute : FactAttribute
 public sealed class AbLegacyTheoryAttribute : TheoryAttribute
 {
     /// <summary>Initializes the attribute, skipping the test if the server is unavailable.</summary>
-    public AbLegacyTheoryAttribute()
+    public AbLegacyTheoryAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!AbLegacyServerFixture.IsServerAvailable())
             Skip = "AB Legacy PCCC endpoint not reachable. Start the Docker fixture " +
diff --git a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs
index 3bcf82f1..3c114398 100644
--- a/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs
+++ b/tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCATXarFixture.cs
@@ -124,7 +124,10 @@ public sealed class TwinCATXarCollection : Xunit.ICollectionFixture<TwinCATXarFi
 public sealed class TwinCATFactAttribute : FactAttribute
 {
     /// <summary>Initializes a new instance of the TwinCATFactAttribute class.</summary>
-    public TwinCATFactAttribute()
+    public TwinCATFactAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!TwinCATXarFixture.IsRuntimeAvailable())
             Skip = "TwinCAT XAR not reachable. See docs/drivers/TwinCAT-Test-Fixture.md " +
@@ -136,7 +139,10 @@ public sealed class TwinCATFactAttribute : FactAttribute
 public sealed class TwinCATTheoryAttribute : TheoryAttribute
 {
     /// <summary>Initializes a new instance of the TwinCATTheoryAttribute class.</summary>
-    public TwinCATTheoryAttribute()
+    public TwinCATTheoryAttribute(
+        [System.Runtime.CompilerServices.CallerFilePath] string? sourceFilePath = null,
+        [System.Runtime.CompilerServices.CallerLineNumber] int sourceLineNumber = -1)
+        : base(sourceFilePath, sourceLineNumber)
     {
         if (!TwinCATXarFixture.IsRuntimeAvailable())
             Skip = "TwinCAT XAR not reachable. See docs/drivers/TwinCAT-Test-Fixture.md " +
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.csproj b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.csproj
index 7c2e5961..b7cb9ead 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.csproj
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.AdminUI.Tests/ZB.MOM.WW.OtOpcUa.AdminUI.Tests.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit.v3" VersionOverride="3.2.2"/>
+        <PackageReference Include="xunit.v3"/>
         <PackageReference Include="Shouldly"/>
         <PackageReference Include="bunit"/>
         <!-- bUnit (test-only) pulls AngleSharp 1.1.1 (GHSA-pgww-w46g-26qg, moderate, HTML parsing of untrusted
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests.csproj b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests.csproj
index 2b051af8..9b1252e6 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests.csproj
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests/ZB.MOM.WW.OtOpcUa.ControlPlane.Tests.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit.v3" VersionOverride="3.2.2"/>
+        <PackageReference Include="xunit.v3"/>
         <PackageReference Include="Shouldly"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="Akka.TestKit.Xunit"/>
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.Tests/ZB.MOM.WW.OtOpcUa.Host.Tests.csproj b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.Tests/ZB.MOM.WW.OtOpcUa.Host.Tests.csproj
index 6b68aa55..96939029 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Host.Tests/ZB.MOM.WW.OtOpcUa.Host.Tests.csproj
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Host.Tests/ZB.MOM.WW.OtOpcUa.Host.Tests.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit.v3" VersionOverride="3.2.2"/>
+        <PackageReference Include="xunit.v3"/>
         <PackageReference Include="Shouldly"/>
         <!-- NodeCommandGrpcServiceTests registers a TestProbe under NodeCommunicationActorKey, so the
              service is asserted against the same ActorRegistry seam the Host wires in production. -->
diff --git a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/ZB.MOM.WW.OtOpcUa.Runtime.Tests.csproj b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/ZB.MOM.WW.OtOpcUa.Runtime.Tests.csproj
index 098bb3c1..276983f6 100644
--- a/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/ZB.MOM.WW.OtOpcUa.Runtime.Tests.csproj
+++ b/tests/Server/ZB.MOM.WW.OtOpcUa.Runtime.Tests/ZB.MOM.WW.OtOpcUa.Runtime.Tests.csproj
@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit.v3" VersionOverride="3.2.2"/>
+        <PackageReference Include="xunit.v3"/>
         <PackageReference Include="Shouldly"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk"/>
         <PackageReference Include="Akka.TestKit.Xunit"/>