Skip to content

Commit ea0a103

Browse files
authored
Downgrade xunit back to 2.6.1 (#3094)
1 parent ba34317 commit ea0a103

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

Directory.Packages.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
2525
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
26-
<PackageVersion Include="xunit" Version="2.6.6" />
26+
<PackageVersion Include="xunit" Version="2.6.1" />
2727
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
2828
<PackageVersion Include="GitHubActionsTestLogger" Version="2.3.3" />
2929
</ItemGroup>

test/EFCore.PG.FunctionalTests/ModelBuilding/NpgsqlModelBuilderGenericTest.cs

-25
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ public class NpgsqlModelBuilderGenericTest : NpgsqlModelBuilderTestBase
88
{
99
public class NpgsqlGenericNonRelationship(NpgsqlModelBuilderFixture fixture) : NpgsqlNonRelationship(fixture)
1010
{
11-
// https://github.com/dotnet/efcore/issues/33059
12-
public override void Can_add_multiple_indexes()
13-
=> Assert.Throws<EqualException>(() => base.Can_add_multiple_indexes());
14-
1511
// PostgreSQL actually does support mapping multi-dimensional arrays, so no exception is thrown as expected
1612
protected override void Mapping_throws_for_non_ignored_three_dimensional_array()
1713
=> Assert.Throws<ThrowsException>(() => base.Mapping_throws_for_non_ignored_three_dimensional_array());
@@ -23,14 +19,6 @@ protected override TestModelBuilder CreateModelBuilder(
2319

2420
public class NpgsqlGenericComplexType(NpgsqlModelBuilderFixture fixture) : NpgsqlComplexType(fixture)
2521
{
26-
// https://github.com/dotnet/efcore/issues/33059
27-
public override void Access_mode_can_be_overridden_at_entity_and_property_levels()
28-
=> Assert.Throws<EqualException>(() => base.Access_mode_can_be_overridden_at_entity_and_property_levels());
29-
30-
// https://github.com/dotnet/efcore/issues/33059
31-
public override void Complex_properties_not_discovered_by_convention()
32-
=> Assert.Throws<EqualException>(() => base.Complex_properties_not_discovered_by_convention());
33-
3422
protected override TestModelBuilder CreateModelBuilder(
3523
Action<ModelConfigurationBuilder>? configure)
3624
=> new GenericTestModelBuilder(Fixture, configure);
@@ -66,26 +54,13 @@ protected override TestModelBuilder CreateModelBuilder(
6654

6755
public class NpgsqlGenericManyToMany(NpgsqlModelBuilderFixture fixture) : NpgsqlManyToMany(fixture)
6856
{
69-
// https://github.com/dotnet/efcore/issues/33059
70-
public override void Can_use_implicit_shared_type_with_default_name_and_implicit_relationships_as_join_entity()
71-
=> Assert.Throws<EqualException>(
72-
() => base.Can_use_implicit_shared_type_with_default_name_and_implicit_relationships_as_join_entity());
73-
7457
protected override TestModelBuilder CreateModelBuilder(
7558
Action<ModelConfigurationBuilder>? configure)
7659
=> new GenericTestModelBuilder(Fixture, configure);
7760
}
7861

7962
public class NpgsqlGenericOwnedTypes(NpgsqlModelBuilderFixture fixture) : NpgsqlOwnedTypes(fixture)
8063
{
81-
// https://github.com/dotnet/efcore/issues/33059
82-
public override void Can_configure_chained_ownerships()
83-
=> Assert.Throws<EqualException>(() => base.Can_configure_chained_ownerships());
84-
85-
// https://github.com/dotnet/efcore/issues/33059
86-
public override void Can_configure_chained_ownerships_different_order()
87-
=> Assert.Throws<EqualException>(() => base.Can_configure_chained_ownerships_different_order());
88-
8964
// PostgreSQL stored procedures do not support result columns
9065
public override void Can_use_sproc_mapping_with_owned_reference()
9166
=> Assert.Throws<InvalidOperationException>(() => base.Can_use_sproc_mapping_with_owned_reference());

0 commit comments

Comments
 (0)