Skip to content

Commit

Permalink
Synchronize to the released version of 5.0.0-preview2
Browse files Browse the repository at this point in the history
  • Loading branch information
roji committed Apr 2, 2020
1 parent 6f34754 commit 649bef6
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<EFCoreVersion>5.0.0-preview.2.20152.2</EFCoreVersion>
<EFCoreVersion>5.0.0-preview.2.20159.4</EFCoreVersion>
<MicrosoftExtensionsVersion>3.1.2</MicrosoftExtensionsVersion>
<NpgsqlVersion>4.1.3</NpgsqlVersion>
</PropertyGroup>
Expand Down
8 changes: 0 additions & 8 deletions NuGet.config

This file was deleted.

10 changes: 5 additions & 5 deletions test/EFCore.PG.FunctionalTests/Query/ArrayArrayQueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public void SequenceEqual_with_array_literal()

#region Containment

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_literal()
{
using var ctx = CreateContext();
Expand All @@ -119,7 +119,7 @@ public void Contains_with_literal()
LIMIT 2");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_parameter()
{
using var ctx = CreateContext();
Expand All @@ -137,7 +137,7 @@ public void Contains_with_parameter()
LIMIT 2");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_column()
{
using var ctx = CreateContext();
Expand Down Expand Up @@ -280,7 +280,7 @@ public void Any_like_anonymous()
WHERE s.""SomeText"" LIKE ANY (@__patterns_0)");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Any_Contains()
{
using var ctx = CreateContext();
Expand All @@ -305,7 +305,7 @@ public void Any_Contains()
WHERE (ARRAY[1,2]::integer[] && s.""SomeArray"")");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void All_Contains()
{
using var ctx = CreateContext();
Expand Down
10 changes: 5 additions & 5 deletions test/EFCore.PG.FunctionalTests/Query/ArrayListQueryTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public void SequenceEqual_with_array_literal()

#region Containment

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_literal()
{
using var ctx = CreateContext();
Expand All @@ -117,7 +117,7 @@ public void Contains_with_literal()
LIMIT 2");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_parameter()
{
using var ctx = CreateContext();
Expand All @@ -135,7 +135,7 @@ public void Contains_with_parameter()
LIMIT 2");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Contains_with_column()
{
using var ctx = CreateContext();
Expand Down Expand Up @@ -260,7 +260,7 @@ public void Any_like_anonymous()
WHERE s.""SomeText"" LIKE ANY (@__patterns_0)");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void Any_Contains()
{
using var ctx = CreateContext();
Expand All @@ -285,7 +285,7 @@ public void Any_Contains()
WHERE (ARRAY[1,2]::integer[] && s.""SomeList"")");
}

[Fact]
[Fact(Skip = "https://github.com/dotnet/efcore/issues/20369")]
public void All_Contains()
{
using var ctx = CreateContext();
Expand Down
8 changes: 4 additions & 4 deletions test/EFCore.PG.FunctionalTests/Query/NavigationTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public void Duplicate_entries_are_not_created_for_navigations_to_principal()
var entityType = model.GetEntityTypes().First();

Assert.Equal(
"ForeignKey: GoTPerson {'LoverId'} -> GoTPerson {'Id'} Unique ToDependent: LoverReverse ToPrincipal: Lover",
"ForeignKey: GoTPerson {'LoverId'} -> GoTPerson {'Id'} Unique ToDependent: LoverReverse ToPrincipal: Lover ClientSetNull",
entityType.GetForeignKeys().First().ToString());

Assert.Equal(
"ForeignKey: GoTPerson {'SiblingReverseId'} -> GoTPerson {'Id'} ToDependent: Siblings ToPrincipal: SiblingReverse",
"ForeignKey: GoTPerson {'SiblingReverseId'} -> GoTPerson {'Id'} ToDependent: Siblings ToPrincipal: SiblingReverse ClientSetNull",
entityType.GetForeignKeys().Skip(1).First().ToString());
}

Expand All @@ -50,11 +50,11 @@ public void Duplicate_entries_are_not_created_for_navigations_to_dependant()
var entityType = model.GetEntityTypes().First();

Assert.Equal(
"ForeignKey: GoTPerson {'LoverId'} -> GoTPerson {'Id'} Unique ToDependent: LoverReverse ToPrincipal: Lover",
"ForeignKey: GoTPerson {'LoverId'} -> GoTPerson {'Id'} Unique ToDependent: LoverReverse ToPrincipal: Lover ClientSetNull",
entityType.GetForeignKeys().First().ToString());

Assert.Equal(
"ForeignKey: GoTPerson {'SiblingReverseId'} -> GoTPerson {'Id'} ToDependent: Siblings ToPrincipal: SiblingReverse",
"ForeignKey: GoTPerson {'SiblingReverseId'} -> GoTPerson {'Id'} ToDependent: Siblings ToPrincipal: SiblingReverse ClientSetNull",
entityType.GetForeignKeys().Skip(1).First().ToString());
}

Expand Down

0 comments on commit 649bef6

Please sign in to comment.