Update to .NET 8 and EF Core 8 (preview 4)

bkoelman · bkoelman · commit b7c44b9eb8d2 · 2023-06-14T16:55:21.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,18 +1,19 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworkName>net7.0</TargetFrameworkName>
-    <AspNetVersion>7.0.*</AspNetVersion>
-    <EFCoreVersion>7.0.*</EFCoreVersion>
-    <EFCorePostgresVersion>7.0.*</EFCorePostgresVersion>
-    <MicrosoftCodeAnalysisVersion>4.5.*</MicrosoftCodeAnalysisVersion>
+    <TargetFrameworkName>net8.0</TargetFrameworkName>
+    <AspNetVersion>8.0.0-preview.4*</AspNetVersion>
+    <EFCoreVersion>8.0.0-preview.4*</EFCoreVersion>
+    <EFCorePostgresVersion>8.0.0-preview.4*</EFCorePostgresVersion>
+    <MicrosoftCodeAnalysisVersion>4.6.*</MicrosoftCodeAnalysisVersion>
     <HumanizerVersion>2.14.1</HumanizerVersion>
-    <JsonApiDotNetCoreVersionPrefix>5.2.1</JsonApiDotNetCoreVersionPrefix>
+    <JsonApiDotNetCoreVersionPrefix>5.2.1-pre</JsonApiDotNetCoreVersionPrefix>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>9999</WarningLevel>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <IsPackable>false</IsPackable>
     <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
+    <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj b/src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj
@@ -7,6 +7,7 @@
     <NoWarn>$(NoWarn);NU5128</NoWarn>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -47,6 +48,6 @@
 
   <ItemGroup>
     <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" PrivateAssets="all" GeneratePathProperty="true" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -39,8 +39,8 @@
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
   </ItemGroup>
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -351,7 +351,7 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C
             if (RequiresLoadOfRelationshipForDeletion(relationship))
             {
                 NavigationEntry navigation = GetNavigationEntry(resourceTracked, relationship);
-                await navigation.LoadAsync(cancellationToken);
+                await navigation.LoadAsync(cancellationToken: cancellationToken);
             }
         }
 
@@ -595,7 +595,7 @@ protected async Task UpdateRelationshipAsync(RelationshipAttribute relationship,
             EntityEntry entityEntry = _dbContext.Entry(trackedValueToAssign);
             string inversePropertyName = relationship.InverseNavigationProperty!.Name;
 
-            await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken);
+            await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken: cancellationToken);
         }
 
         relationship.SetValue(leftResource, trackedValueToAssign);
diff --git a/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Serialization.Response;
 /// <inheritdoc />
 internal sealed class FingerprintGenerator : IFingerprintGenerator
 {
-    private static readonly byte[] Separator = Encoding.UTF8.GetBytes("|");
+    private static readonly byte[] Separator = "|"u8.ToArray();
     private static readonly uint[] LookupTable = Enumerable.Range(0, 256).Select(ToLookupEntry).ToArray();
 
     private static uint ToLookupEntry(int index)
diff --git a/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs b/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs
@@ -137,7 +137,7 @@ private bool SetETagResponseHeader(HttpRequest request, HttpResponse response, s
             string url = request.GetEncodedUrl();
             EntityTagHeaderValue responseETag = _eTagGenerator.Generate(url, responseContent);
 
-            response.Headers.Add(HeaderNames.ETag, responseETag.ToString());
+            response.Headers.Append(HeaderNames.ETag, responseETag.ToString());
 
             return RequestContainsMatchingETag(request.Headers, responseETag);
         }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs
@@ -33,7 +33,7 @@ public async Task ApiController_attribute_transforms_NotFound_action_result_with
 
         ErrorObject error = responseDocument.Errors[0];
         error.Links.ShouldNotBeNull();
-        error.Links.About.Should().Be("https://tools.ietf.org/html/rfc7231#section-6.5.4");
+        error.Links.About.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.5");
     }
 
     [Fact]
@@ -66,15 +66,15 @@ public async Task ProblemDetails_from_invalid_ModelState_is_translated_into_erro
         ErrorObject error1 = responseDocument.Errors[0];
         error1.StatusCode.Should().Be(HttpStatusCode.BadRequest);
         error1.Links.ShouldNotBeNull();
-        error1.Links.About.Should().Be("https://tools.ietf.org/html/rfc7231#section-6.5.1");
+        error1.Links.About.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
         error1.Title.Should().Be("One or more validation errors occurred.");
         error1.Detail.Should().Be("The Name field is required.");
         error1.Source.Should().BeNull();
 
         ErrorObject error2 = responseDocument.Errors[1];
         error2.StatusCode.Should().Be(HttpStatusCode.BadRequest);
         error2.Links.ShouldNotBeNull();
-        error2.Links.About.Should().Be("https://tools.ietf.org/html/rfc7231#section-6.5.1");
+        error2.Links.About.Should().Be("https://tools.ietf.org/html/rfc9110#section-15.5.1");
         error2.Title.Should().Be("One or more validation errors occurred.");
         error2.Detail.Should().Be("The field YearOfBirth must be between 1900 and 2050.");
         error2.Source.Should().BeNull();
diff --git a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj
@@ -16,6 +16,6 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="System.Text.Json" Version="7.0.*" />
+    <PackageReference Include="System.Text.Json" Version="$(AspNetVersion)" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public virtual async Task DeleteAsync(TResource? resourceFromDatabase, TId id, C`
`351`	`351`	`if (RequiresLoadOfRelationshipForDeletion(relationship))`
`352`	`352`	`{`
`353`	`353`	`NavigationEntry navigation = GetNavigationEntry(resourceTracked, relationship);`
`354`		`- await navigation.LoadAsync(cancellationToken);`
	`354`	`+ await navigation.LoadAsync(cancellationToken: cancellationToken);`
`355`	`355`	`}`
`356`	`356`	`}`
`357`	`357`
`@@ -595,7 +595,7 @@ protected async Task UpdateRelationshipAsync(RelationshipAttribute relationship,`
`595`	`595`	`EntityEntry entityEntry = _dbContext.Entry(trackedValueToAssign);`
`596`	`596`	`string inversePropertyName = relationship.InverseNavigationProperty!.Name;`
`597`	`597`
`598`		`- await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken);`
	`598`	`+ await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken: cancellationToken);`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`relationship.SetValue(leftResource, trackedValueToAssign);`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Serialization.Response;`
`6`	`6`	`/// <inheritdoc />`
`7`	`7`	`internal sealed class FingerprintGenerator : IFingerprintGenerator`
`8`	`8`	`{`
`9`		`- private static readonly byte[] Separator = Encoding.UTF8.GetBytes("\|");`
	`9`	`+ private static readonly byte[] Separator = "\|"u8.ToArray();`
`10`	`10`	`private static readonly uint[] LookupTable = Enumerable.Range(0, 256).Select(ToLookupEntry).ToArray();`
`11`	`11`
`12`	`12`	`private static uint ToLookupEntry(int index)`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ private bool SetETagResponseHeader(HttpRequest request, HttpResponse response, s`
`137`	`137`	`string url = request.GetEncodedUrl();`
`138`	`138`	`EntityTagHeaderValue responseETag = _eTagGenerator.Generate(url, responseContent);`
`139`	`139`
`140`		`- response.Headers.Add(HeaderNames.ETag, responseETag.ToString());`
	`140`	`+ response.Headers.Append(HeaderNames.ETag, responseETag.ToString());`
`141`	`141`
`142`	`142`	`return RequestContainsMatchingETag(request.Headers, responseETag);`
`143`	`143`	`}`