From 0459bcb551c8904e1a7853eca68f02a15140147c Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:08:42 +0000
Subject: [PATCH 1/3] [Dependencies] Updating xunit.v3 (Test Infrastructure) to
 3.2.0

# Conflicts:
#	CHANGELOG.md
---
 CHANGELOG.md                                                    | 1 +
 .../FunFair.CodeAnalysis.Tests.csproj                           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5eea0968..971a38f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 - Dependencies - Updated FunFair.Test.Common to 6.2.3.1786
 - Dependencies - Updated xunit.analyzers to 1.25.0
 - Dependencies - Updated Meziantou.Analyzer to 2.0.250
+- Dependencies - Updated xunit.v3 to 3.2.0
 ### Removed
 ### Deployment Changes
 
diff --git a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
index 759a9b10..af062b15 100644
--- a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
+++ b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
@@ -57,7 +57,7 @@
     <PackageReference Include="FunFair.Test.Common" Version="6.2.3.1786" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="xunit.v3" Version="3.1.0" />
+    <PackageReference Include="xunit.v3" Version="3.2.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" ExcludeAssets="runtime" />

From 5e1836caee381824142e2abd0016c114eb9d33ce Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:32:31 +0000
Subject: [PATCH 2/3] Updated package

---
 CHANGELOG.md                                       |  2 +-
 src/FunFair.CodeAnalysis.Tests/AssemblySettings.cs | 14 --------------
 .../FunFair.CodeAnalysis.Tests.csproj              |  6 ++++--
 3 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 src/FunFair.CodeAnalysis.Tests/AssemblySettings.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 971a38f6..6eb4b4db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
 ### Added
 ### Fixed
 ### Changed
-- Dependencies - Updated FunFair.Test.Common to 6.2.3.1786
+- Dependencies - Updated FunFair.Test.Common to 6.2.4.1830
 - Dependencies - Updated xunit.analyzers to 1.25.0
 - Dependencies - Updated Meziantou.Analyzer to 2.0.250
 - Dependencies - Updated xunit.v3 to 3.2.0
diff --git a/src/FunFair.CodeAnalysis.Tests/AssemblySettings.cs b/src/FunFair.CodeAnalysis.Tests/AssemblySettings.cs
deleted file mode 100644
index 52a78626..00000000
--- a/src/FunFair.CodeAnalysis.Tests/AssemblySettings.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using System.Diagnostics.CodeAnalysis;
-
-[assembly: SuppressMessage(
-    category: "Philips.CodeAnalysis.MaintainabilityAnalyzers",
-    checkId: "PH2140: Avoid ExcludeFromCodeCoverage",
-    Justification = "This is a unit test assembly - no need for coverage of the test code itself"
-)]
-[assembly: ExcludeFromCodeCoverage]
-
-[assembly: SuppressMessage(
-    category: "Philips.CodeAnalysis.DuplicateCodeAnalyzer",
-    checkId: "PH2071:DuplicateCodeDetection",
-    Justification = "Test code"
-)]
diff --git a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
index af062b15..a61d0120 100644
--- a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
+++ b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
@@ -52,18 +52,20 @@
   <ItemGroup>
     <ProjectReference Include="..\FunFair.CodeAnalysis\FunFair.CodeAnalysis.csproj" />
   </ItemGroup>
+  <Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')"/>
   <ItemGroup>
     <PackageReference Include="Credfeto.Enumeration.Source.Generation.Attributes" Version="1.2.129.1430" />
-    <PackageReference Include="FunFair.Test.Common" Version="6.2.3.1786" />
+    <PackageReference Include="FunFair.Test.Common" Version="6.2.4.1830" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
-    <PackageReference Include="xunit.v3" Version="3.2.0" />
+    <PackageReference Include="xunit.v3.mtp-v2" Version="3.2.0" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AsyncFixer" Version="1.6.0" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="Credfeto.Enumeration.Source.Generation" Version="1.2.129.1430" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="CSharpIsNullAnalyzer" Version="0.1.593" PrivateAssets="all" ExcludeAssets="runtime" />
     <PackageReference Include="DisableDateTimeNow" Version="1.0.5883.39470" PrivateAssets="All" ExcludeAssets="runtime" />
+    <PackageReference Include="FunFair.Test.Source.Generator" Version="6.2.4.1830" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.250" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.14.15" PrivateAssets="All" ExcludeAssets="runtime" />
     <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" PrivateAssets="All" ExcludeAssets="runtime" />

From ac8060364c82b4642799571b17ccfe1285baefad Mon Sep 17 00:00:00 2001
From: Mark Ridgwell <credfeto@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:40:16 +0000
Subject: [PATCH 3/3] Fixing tests

---
 .../FunFair.CodeAnalysis.Tests.csproj                         | 3 +--
 src/FunFair.CodeAnalysis/FunFair.CodeAnalysis.csproj          | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
index a61d0120..efe7a765 100644
--- a/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
+++ b/src/FunFair.CodeAnalysis.Tests/FunFair.CodeAnalysis.Tests.csproj
@@ -40,7 +40,6 @@
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
     <WarningsAsErrors />
   </PropertyGroup>
-  <Import Project="$(SolutionDir)\FunFair.props" />
   <ItemGroup>
     <!-- error NU1903: Warning As Error: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability -->
     <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-5f2m-466j-3848" />
@@ -49,10 +48,10 @@
     <!-- error NU1903: Warning As Error: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability -->
     <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xhfc-gr8f-ffwc" />
   </ItemGroup>
+  <Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')"/>
   <ItemGroup>
     <ProjectReference Include="..\FunFair.CodeAnalysis\FunFair.CodeAnalysis.csproj" />
   </ItemGroup>
-  <Import Project="$(SolutionDir)UnitTests.props" Condition="Exists('$(SolutionDir)UnitTests.props')"/>
   <ItemGroup>
     <PackageReference Include="Credfeto.Enumeration.Source.Generation.Attributes" Version="1.2.129.1430" />
     <PackageReference Include="FunFair.Test.Common" Version="6.2.4.1830" />
diff --git a/src/FunFair.CodeAnalysis/FunFair.CodeAnalysis.csproj b/src/FunFair.CodeAnalysis/FunFair.CodeAnalysis.csproj
index 204e161b..eaebcb73 100644
--- a/src/FunFair.CodeAnalysis/FunFair.CodeAnalysis.csproj
+++ b/src/FunFair.CodeAnalysis/FunFair.CodeAnalysis.csproj
@@ -51,8 +51,6 @@
     <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)FunFair.props" />
-  <Import Project="$(SolutionDir)Analyzer.props" />
   <ItemGroup>
     <!-- error NU1903: Warning As Error: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability -->
     <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-5f2m-466j-3848" />
@@ -61,6 +59,8 @@
     <!-- error NU1903: Warning As Error: Package 'System.Private.Uri' 4.3.0 has a known high severity vulnerability -->
     <NuGetAuditSuppress Include="https://github.com/advisories/GHSA-xhfc-gr8f-ffwc" />
   </ItemGroup>
+  <Import Project="$(SolutionDir)FunFair.props" Condition="Exists('$(SolutionDir)FunFair.props')" />
+  <Import Project="$(SolutionDir)Analyzer.props" Condition="Exists('$(SolutionDir)Analyzer.props')" />
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
   </ItemGroup>