Update to run on EF Core 5

Bart Koelman · Bart Koelman · commit 16270b6f0c11 · 2021-05-06T12:48:53.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
     <AspNetCoreVersion>3.1.*</AspNetCoreVersion>
-    <EFCoreVersion>3.1.*</EFCoreVersion>
-    <NpgsqlPostgreSQLVersion>3.1.*</NpgsqlPostgreSQLVersion>
+    <EFCoreVersion>5.0.*</EFCoreVersion>
+    <NpgsqlPostgreSQLVersion>5.0.*</NpgsqlPostgreSQLVersion>
     <CodeAnalysisRuleSet>$(SolutionDir)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/EngagementPartyResourceDefinition.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/EngagementPartyResourceDefinition.cs
@@ -17,7 +17,7 @@ public EngagementPartyResourceDefinition(IResourceGraph resourceGraph)
         }
 
         /// <inheritdoc />
-        public override SortExpression OnApplySort(SortExpression? existingSort)
+        public override SortExpression OnApplySort(SortExpression existingSort)
         {
             if (existingSort != null)
             {
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/IssueTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Issue988/IssueTests.cs
@@ -58,7 +58,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             responseDocument.Included.Should().BeNull();
         }
 
-        [Fact(Skip = "Fails in EF Core with: Invalid include path: 'FirstParties' - couldn't find navigation for: 'FirstParties'")]
+        [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]
         public async Task Can_get_primary_resource_by_ID_with_includes()
         {
             // Arrange
@@ -183,7 +183,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             responseDocument.Included.Should().BeNull();
         }
 
-        [Fact(Skip = "Fails in EF Core with: Invalid include path: 'FirstParties' - couldn't find navigation for: 'FirstParties'")]
+        [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]
         public async Task Can_get_unmapped_secondary_resources_by_ID()
         {
             // Arrange
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs
@@ -94,7 +94,7 @@ public async Task Cannot_create_dependent_side_of_required_OneToOne_relationship
             Error error = responseDocument.Errors[0];
             error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
             error.Title.Should().Be("An unhandled error occurred while processing this request.");
-            error.Detail.Should().Be("Failed to persist changes in the underlying data store.");
+            error.Detail.Should().StartWith("The value of 'Shipment.Id' is unknown when attempting to save changes.");
         }
 
         [Fact]
@@ -431,7 +431,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             Error error = responseDocument.Errors[0];
             error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
             error.Title.Should().Be("An unhandled error occurred while processing this request.");
-            error.Detail.Should().StartWith("The property 'Id' on entity type 'Shipment' is part of a key and so cannot be modified or marked as modified.");
+            error.Detail.Should().StartWith("The property 'Shipment.Id' is part of a key and so cannot be modified or marked as modified.");
         }
 
         [Fact]
@@ -473,7 +473,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             Error error = responseDocument.Errors[0];
             error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
             error.Title.Should().Be("An unhandled error occurred while processing this request.");
-            error.Detail.Should().StartWith("The property 'Id' on entity type 'Shipment' is part of a key and so cannot be modified or marked as modified.");
+            error.Detail.Should().StartWith("The property 'Shipment.Id' is part of a key and so cannot be modified or marked as modified.");
         }
     }
 }
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
     <PackageReference Include="xunit" Version="$(XUnitVersion)" />

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public EngagementPartyResourceDefinition(IResourceGraph resourceGraph)`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`/// <inheritdoc />`
`20`		`- public override SortExpression OnApplySort(SortExpression? existingSort)`
	`20`	`+ public override SortExpression OnApplySort(SortExpression existingSort)`
`21`	`21`	`{`
`22`	`22`	`if (existingSort != null)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`58`	`58`	`responseDocument.Included.Should().BeNull();`
`59`	`59`	`}`
`60`	`60`
`61`		`- [Fact(Skip = "Fails in EF Core with: Invalid include path: 'FirstParties' - couldn't find navigation for: 'FirstParties'")]`
	`61`	`+ [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]`
`62`	`62`	`public async Task Can_get_primary_resource_by_ID_with_includes()`
`63`	`63`	`{`
`64`	`64`	`// Arrange`
`@@ -183,7 +183,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`183`	`183`	`responseDocument.Included.Should().BeNull();`
`184`	`184`	`}`
`185`	`185`
`186`		`- [Fact(Skip = "Fails in EF Core with: Invalid include path: 'FirstParties' - couldn't find navigation for: 'FirstParties'")]`
	`186`	`+ [Fact(Skip = "Fails in EF Core with: Unable to find navigation 'FirstParties' specified in string based include path 'FirstParties'.")]`
`187`	`187`	`public async Task Can_get_unmapped_secondary_resources_by_ID()`
`188`	`188`	`{`
`189`	`189`	`// Arrange`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public async Task Cannot_create_dependent_side_of_required_OneToOne_relationship`
`94`	`94`	`Error error = responseDocument.Errors[0];`
`95`	`95`	`error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);`
`96`	`96`	`error.Title.Should().Be("An unhandled error occurred while processing this request.");`
`97`		`- error.Detail.Should().Be("Failed to persist changes in the underlying data store.");`
	`97`	`+ error.Detail.Should().StartWith("The value of 'Shipment.Id' is unknown when attempting to save changes.");`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`[Fact]`
`@@ -431,7 +431,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`431`	`431`	`Error error = responseDocument.Errors[0];`
`432`	`432`	`error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);`
`433`	`433`	`error.Title.Should().Be("An unhandled error occurred while processing this request.");`
`434`		`- error.Detail.Should().StartWith("The property 'Id' on entity type 'Shipment' is part of a key and so cannot be modified or marked as modified.");`
	`434`	`+ error.Detail.Should().StartWith("The property 'Shipment.Id' is part of a key and so cannot be modified or marked as modified.");`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`[Fact]`
`@@ -473,7 +473,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>`
`473`	`473`	`Error error = responseDocument.Errors[0];`
`474`	`474`	`error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);`
`475`	`475`	`error.Title.Should().Be("An unhandled error occurred while processing this request.");`
`476`		`- error.Detail.Should().StartWith("The property 'Id' on entity type 'Shipment' is part of a key and so cannot be modified or marked as modified.");`
	`476`	`+ error.Detail.Should().StartWith("The property 'Shipment.Id' is part of a key and so cannot be modified or marked as modified.");`
`477`	`477`	`}`
`478`	`478`	`}`
`479`	`479`	`}`