From 806009b9f7ac964bcaf3aa44cae4e82858808daa Mon Sep 17 00:00:00 2001
From: Jiri Cincura <jiri@cincura.net>
Date: Tue, 10 Dec 2024 10:44:37 +0100
Subject: [PATCH] Update testing packages.

---
 .../EntityFramework.Firebird.Tests.csproj           | 13 +++++++++----
 .../FirebirdSql.Data.FirebirdClient.Tests.csproj    | 13 +++++++++----
 ...ityFrameworkCore.Firebird.FunctionalTests.csproj |  6 +++---
 .../Query/NorthwindKeylessEntitiesQueryFbTest.cs    |  7 ++-----
 ...irdSql.EntityFrameworkCore.Firebird.Tests.csproj | 13 +++++++++----
 5 files changed, 32 insertions(+), 20 deletions(-)

diff --git a/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj b/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj
index 52ce20027..52fbd1394 100644
--- a/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj
+++ b/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj
@@ -11,15 +11,20 @@
 		<OutputType>Exe</OutputType>
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
+	<ItemGroup>
+		<Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+		<Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+		<Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
 		<!-- left in repo as an example/documentation for .NET Framework -->
 		<None Remove="app.config" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnitLite" Version="3.13.3" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="4.2.2" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+		<PackageReference Include="NUnitLite" Version="4.2.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\EntityFramework.Firebird\EntityFramework.Firebird.csproj" />
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj b/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj
index 8f2fc2b53..1e902480b 100644
--- a/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj
+++ b/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj
@@ -12,10 +12,15 @@
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnitLite" Version="3.13.3" />
+		<Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+		<Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+		<Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="4.2.2" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+		<PackageReference Include="NUnitLite" Version="4.2.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FirebirdSql.Data.FirebirdClient\FirebirdSql.Data.FirebirdClient.csproj" />
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj
index bbadea15a..e4f0a5297 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj
@@ -12,9 +12,9 @@
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Relational.Specification.Tests" Version="$(EFCoreReferencePackageVersion)" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="xunit" Version="2.4.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="xunit" Version="2.9.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindKeylessEntitiesQueryFbTest.cs b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindKeylessEntitiesQueryFbTest.cs
index cae3409d5..c2e290cda 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindKeylessEntitiesQueryFbTest.cs
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/Query/NorthwindKeylessEntitiesQueryFbTest.cs
@@ -48,12 +48,9 @@ public override Task Entity_mapped_to_view_on_right_side_of_join(bool async)
 
 	[Theory]
 	[MemberData(nameof(IsAsyncData))]
-	public override async Task KeylessEntity_with_nav_defining_query(bool async)
+	public override Task KeylessEntity_with_nav_defining_query(bool async)
 	{
-		Assert.Equal(
-			"0",
-			(await Assert.ThrowsAsync<EqualException>(
-				() => base.KeylessEntity_with_nav_defining_query(async))).Actual);
+		return Assert.ThrowsAsync<EqualException>(() => base.KeylessEntity_with_nav_defining_query(async));
 	}
 
 	[Theory]
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj b/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj
index ce3ed3f3b..851bf975e 100644
--- a/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj
+++ b/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj
@@ -12,10 +12,15 @@
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
-		<PackageReference Include="NUnit" Version="3.13.3" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-		<PackageReference Include="NUnitLite" Version="3.13.3" />
+		<Using Include="NUnit.Framework.Legacy.ClassicAssert" Alias="Assert" />
+		<Using Include="NUnit.Framework.Legacy.CollectionAssert" Alias="CollectionAssert" />
+		<Using Include="NUnit.Framework.Legacy.StringAssert" Alias="StringAssert" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+		<PackageReference Include="NUnit" Version="4.2.2" />
+		<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
+		<PackageReference Include="NUnitLite" Version="4.2.2" />
 	</ItemGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\FirebirdSql.EntityFrameworkCore.Firebird\FirebirdSql.EntityFrameworkCore.Firebird.csproj" />