Merge branch 'master' into merge-v5-into-openapi

Author: bkoelman

Directory.Build.props

@@ -7,7 +7,7 @@
     <MicrosoftCodeAnalysisVersion>4.1.*</MicrosoftCodeAnalysisVersion>
     <HumanizerVersion>2.14.1</HumanizerVersion>
     <SwashbuckleVersion>6.2.*</SwashbuckleVersion>
-    <JsonApiDotNetCoreVersionPrefix>5.0.1</JsonApiDotNetCoreVersionPrefix>
+    <JsonApiDotNetCoreVersionPrefix>5.0.2</JsonApiDotNetCoreVersionPrefix>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>9999</WarningLevel>
     <Nullable>enable</Nullable>

src/JsonApiDotNetCore/Resources/SortExpressionLambdaConverter.cs

@@ -116,7 +116,10 @@ private static (Expression? innerExpression, bool isCount) TryReadCount(Expressi
     {
         if (expression is MemberExpression memberExpression)
         {
-            ResourceType resourceType = _resourceGraph.GetResourceType(memberExpression.Member.DeclaringType!);
+            ResourceType resourceType = memberExpression.Member.Name == nameof(Identifiable<object>.Id) && memberExpression.Expression != null
+                ? _resourceGraph.GetResourceType(memberExpression.Expression.Type)
+                : _resourceGraph.GetResourceType(memberExpression.Member.DeclaringType!);
+
             AttrAttribute? attribute = resourceType.FindAttributeByPropertyName(memberExpression.Member.Name);
 
             if (attribute != null)

test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/WheelSortDefinition.cs

@@ -43,6 +43,7 @@ private SortExpression CreateSortFromExpressionSyntax()
     {
         AttrAttribute paintColorAttribute = ResourceGraph.GetResourceType<ChromeWheel>().GetAttributeByPropertyName(nameof(ChromeWheel.PaintColor));
         AttrAttribute hasTubeAttribute = ResourceGraph.GetResourceType<CarbonWheel>().GetAttributeByPropertyName(nameof(CarbonWheel.HasTube));
+        AttrAttribute idAttribute = ResourceGraph.GetResourceType<Wheel>().GetAttributeByPropertyName(nameof(Wheel.Id));
 
         var cylinderCountChain = new ResourceFieldChainExpression(ImmutableArray.Create<ResourceFieldAttribute>(
             ResourceGraph.GetResourceType<Wheel>().GetRelationshipByPropertyName(nameof(Wheel.Vehicle)),
@@ -53,7 +54,8 @@ private SortExpression CreateSortFromExpressionSyntax()
         {
             new SortElementExpression(new ResourceFieldChainExpression(paintColorAttribute), true),
             new SortElementExpression(new ResourceFieldChainExpression(hasTubeAttribute), false),
-            new SortElementExpression(new CountExpression(cylinderCountChain), true)
+            new SortElementExpression(new CountExpression(cylinderCountChain), true),
+            new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true)
         }.ToImmutableArray());
     }
 
@@ -63,7 +65,8 @@ private SortExpression CreateSortFromLambdaSyntax()
         {
             (wheel => (wheel as ChromeWheel)!.PaintColor, ListSortDirection.Ascending),
             (wheel => ((CarbonWheel)wheel).HasTube, ListSortDirection.Descending),
-            (wheel => ((GasolineEngine)((Car)wheel.Vehicle!).Engine).Cylinders.Count, ListSortDirection.Ascending)
+            (wheel => ((GasolineEngine)((Car)wheel.Vehicle!).Engine).Cylinders.Count, ListSortDirection.Ascending),
+            (wheel => wheel.Id, ListSortDirection.Ascending)
         });
     }
 }