Updated dependencies to build against the latest version of .NET 5

Bart Koelman · Bart Koelman · commit 6c38bf51b287 · 2021-06-23T13:00:08.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
   <PropertyGroup>
-    <NetCoreAppVersion>netcoreapp3.1</NetCoreAppVersion>
-    <AspNetCoreVersion>3.1.*</AspNetCoreVersion>
-    <EFCoreVersion>3.1.*</EFCoreVersion>
-    <NpgsqlPostgreSQLVersion>3.1.*</NpgsqlPostgreSQLVersion>
+    <NetCoreAppVersion>net5.0</NetCoreAppVersion>
+    <AspNetCoreVersion>5.0.*</AspNetCoreVersion>
+    <EFCoreVersion>5.0.*</EFCoreVersion>
+    <NpgsqlPostgreSQLVersion>5.0.*</NpgsqlPostgreSQLVersion>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
diff --git a/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs b/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs
@@ -52,7 +52,7 @@ private void ResolveRelationships(IReadOnlyCollection<RelationshipAttribute> rel
             {
                 if (!(relationship is HasManyThroughAttribute))
                 {
-                    INavigation inverseNavigation = entityType.FindNavigation(relationship.Property.Name)?.FindInverse();
+                    INavigation inverseNavigation = entityType.FindNavigation(relationship.Property.Name)?.Inverse;
                     relationship.InverseNavigationProperty = inverseNavigation?.PropertyInfo;
                 }
             }
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -23,8 +23,8 @@
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
     <PackageReference Include="Humanizer" Version="2.11.10" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -374,7 +374,7 @@ private bool HasForeignKeyAtLeftSide(RelationshipAttribute relationship)
             if (relationship is HasOneAttribute)
             {
                 INavigation navigation = TryGetNavigation(relationship);
-                return navigation?.IsDependentToPrincipal() ?? false;
+                return navigation?.IsOnDependent ?? false;
             }
 
             return false;

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private void ResolveRelationships(IReadOnlyCollection<RelationshipAttribute> rel`
`52`	`52`	`{`
`53`	`53`	`if (!(relationship is HasManyThroughAttribute))`
`54`	`54`	`{`
`55`		`- INavigation inverseNavigation = entityType.FindNavigation(relationship.Property.Name)?.FindInverse();`
	`55`	`+ INavigation inverseNavigation = entityType.FindNavigation(relationship.Property.Name)?.Inverse;`
`56`	`56`	`relationship.InverseNavigationProperty = inverseNavigation?.PropertyInfo;`
`57`	`57`	`}`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ private bool HasForeignKeyAtLeftSide(RelationshipAttribute relationship)`
`374`	`374`	`if (relationship is HasOneAttribute)`
`375`	`375`	`{`
`376`	`376`	`INavigation navigation = TryGetNavigation(relationship);`
`377`		`- return navigation?.IsDependentToPrincipal() ?? false;`
	`377`	`+ return navigation?.IsOnDependent ?? false;`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`return false;`