diff --git a/CHANGELOG.md b/CHANGELOG.md
index eadc0dc5c..a9f413ae3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Pass ILogger to HealthCheckClient.ExecuteAsync to match new API in Credfeto.Docker.HealthCheck.Http.Client 0.0.72.928
- Made DiscordChannelAdapter testable by accepting ITextChannel instead of the sealed SocketTextChannel, and added unit tests
- Guard against IndexOutOfRangeException when Branches list is empty in GithubStatusNotificationHandler
+- Fixed CS0433 ambiguous xunit type conflict in test projects caused by FunFair.Test.Common now depending on the AOT-flavoured xunit v3 packages, by switching test projects to the matching xunit.v3.aot.mtp-v2 runner package
### Changed
- Dependencies - Updated NSubstitute.Analyzers.CSharp to 1.0.17
- Switched to use minimal APIs
@@ -60,7 +61,6 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Dependencies - Updated NSubstitute to 6.2.0
- SDK - Updated DotNet SDK to 10.0.400
- Dependencies - Updated Microsoft.Extensions to 10.0.11
-- Dependencies - Updated FunFair.Test to 6.3.8.2585
- Dependencies - Updated xunit.analyzers to 2.0.0
- Dependencies - Updated xunit.v3 to 4.0.0
- Dependencies - Updated Microsoft.NET.Test.Sdk to 18.9.0
@@ -72,6 +72,7 @@ Please ADD ALL Changes to the UNRELEASED SECTION and not a specific release
- Dependencies - Updated Meziantou.Analyzer to 3.0.173
- Dependencies - Updated Credfeto.Docker.HealthCheck.Http.Client to 0.0.77.1109
- Dependencies - Updated FunFair.Test.Source.Generator to 6.4.0.2617
+- Dependencies - Updated FunFair.Test to 6.4.0.2617
### Deprecated
### Removed
### Deployment Changes
diff --git a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
index eeb371e44..3e3cd7ff5 100644
--- a/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
+++ b/src/BuildBot.CloudFormation.Tests/BuildBot.CloudFormation.Tests.csproj
@@ -44,9 +44,9 @@
-
+
-
+
diff --git a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
index 68e89e99b..c5789f466 100644
--- a/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
+++ b/src/BuildBot.Discord.Tests/BuildBot.Discord.Tests.csproj
@@ -44,10 +44,10 @@
-
+
-
+
diff --git a/src/BuildBot.Discord.Tests/Services/BotServiceTests.cs b/src/BuildBot.Discord.Tests/Services/BotServiceTests.cs
index 3900ac5e1..15e4291c6 100644
--- a/src/BuildBot.Discord.Tests/Services/BotServiceTests.cs
+++ b/src/BuildBot.Discord.Tests/Services/BotServiceTests.cs
@@ -117,7 +117,7 @@ await bot.Received(1)
[Theory]
[MemberData(nameof(NullConstructorArguments))]
- public void Constructor_ThrowsArgumentNullException_WhenParameterIsNull(
+ public static void Constructor_ThrowsArgumentNullException_WhenParameterIsNull(
int nullParameterIndex,
string expectedParamName
)
diff --git a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
index d74cfc285..09a798cd5 100644
--- a/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
+++ b/src/BuildBot.GitHub.Tests/BuildBot.GitHub.Tests.csproj
@@ -44,10 +44,10 @@
-
+
-
+
diff --git a/src/BuildBot.GitHub.Tests/Helpers/MainBranchDetectorTests.cs b/src/BuildBot.GitHub.Tests/Helpers/MainBranchDetectorTests.cs
index 016daad2d..01584ed78 100644
--- a/src/BuildBot.GitHub.Tests/Helpers/MainBranchDetectorTests.cs
+++ b/src/BuildBot.GitHub.Tests/Helpers/MainBranchDetectorTests.cs
@@ -9,7 +9,7 @@ public sealed class MainBranchDetectorTests : TestBase
[Theory]
[InlineData("main")]
[InlineData("master")]
- public void ShouldBeMainBranch(string branch)
+ public static void ShouldBeMainBranch(string branch)
{
Assert.True(MainBranchDetector.IsRepoMainBranch(branch), userMessage: "Should be main branch");
}
@@ -19,7 +19,7 @@ public void ShouldBeMainBranch(string branch)
[InlineData("feature/main")]
[InlineData("fix/master")]
[InlineData("mainly")]
- public void ShouldNotMainBranch(string branch)
+ public static void ShouldNotMainBranch(string branch)
{
Assert.False(MainBranchDetector.IsRepoMainBranch(branch), userMessage: "Should not be main branch");
}
diff --git a/src/BuildBot.GitHub.Tests/Helpers/PackageUpdateDetectorTests.cs b/src/BuildBot.GitHub.Tests/Helpers/PackageUpdateDetectorTests.cs
index 8b9d30a06..cd64f8f43 100644
--- a/src/BuildBot.GitHub.Tests/Helpers/PackageUpdateDetectorTests.cs
+++ b/src/BuildBot.GitHub.Tests/Helpers/PackageUpdateDetectorTests.cs
@@ -11,7 +11,7 @@ public sealed class PackageUpdateDetectorTests : TestBase
[InlineData("[FF-1429] - Updated something else")]
[InlineData("Dependencies - Updated package")]
[InlineData("[Dependencies] - Updated something else")]
- public void ShouldBeConsideredAPackageUpdate(string commitMessage)
+ public static void ShouldBeConsideredAPackageUpdate(string commitMessage)
{
Assert.True(PackageUpdateDetector.IsPackageUpdate(commitMessage), userMessage: "Should be a package update");
}
@@ -24,7 +24,7 @@ public void ShouldBeConsideredAPackageUpdate(string commitMessage)
[InlineData("Validating Dependencies")]
[InlineData("Validating Dependencies of packages")]
[InlineData("Identifying [Dependencies] too")]
- public void ShouldNotBeConsideredAPackageUpdate(string commitMessage)
+ public static void ShouldNotBeConsideredAPackageUpdate(string commitMessage)
{
Assert.False(
PackageUpdateDetector.IsPackageUpdate(commitMessage),
diff --git a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
index 0d373a29e..7b11468a5 100644
--- a/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
+++ b/src/BuildBot.Health.Tests/BuildBot.Health.Tests.csproj
@@ -44,9 +44,9 @@
-
+
-
+
diff --git a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
index 3f6ab6f20..5a9d99f0d 100644
--- a/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
+++ b/src/BuildBot.Json.Tests/BuildBot.Json.Tests.csproj
@@ -44,9 +44,9 @@
-
+
-
+
diff --git a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
index e6c1f7449..4f14bd034 100644
--- a/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
+++ b/src/BuildBot.ServiceModel.Tests/BuildBot.ServiceModel.Tests.csproj
@@ -44,9 +44,9 @@
-
+
-
+
diff --git a/src/BuildBot.ServiceModel.Tests/ComponentStatus/ServiceStatusTests.cs b/src/BuildBot.ServiceModel.Tests/ComponentStatus/ServiceStatusTests.cs
index 6a6b9ab97..d620a5643 100644
--- a/src/BuildBot.ServiceModel.Tests/ComponentStatus/ServiceStatusTests.cs
+++ b/src/BuildBot.ServiceModel.Tests/ComponentStatus/ServiceStatusTests.cs
@@ -17,7 +17,7 @@ public void NamePropertyMatchesConstructorArgument()
[Theory]
[InlineData(true)]
[InlineData(false)]
- public void OkPropertyMatchesConstructorArgument(bool ok)
+ public static void OkPropertyMatchesConstructorArgument(bool ok)
{
ServiceStatus status = new(Name: "database", Ok: ok);
diff --git a/src/BuildBot.Tests/BuildBot.Tests.csproj b/src/BuildBot.Tests/BuildBot.Tests.csproj
index c8eb8d71e..00c9ef2d7 100644
--- a/src/BuildBot.Tests/BuildBot.Tests.csproj
+++ b/src/BuildBot.Tests/BuildBot.Tests.csproj
@@ -44,10 +44,10 @@
-
+
-
+
diff --git a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
index 53fb7498e..0615b8ab5 100644
--- a/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
+++ b/src/BuildBot.Watchtower.Tests/BuildBot.Watchtower.Tests.csproj
@@ -44,9 +44,9 @@
-
+
-
+