Update to ReSharper RC, apply fixes for new language features

bkoelman · bkoelman · commit 188c26e51821 · 2025-11-08T13:50:23.000+01:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2025.3.0-eap07",
+      "version": "2025.3.0-rc01",
       "commands": [
         "jb"
       ],
diff --git a/JsonApiDotNetCore.sln.DotSettings b/JsonApiDotNetCore.sln.DotSettings
@@ -72,8 +72,10 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantOverload_002ELocal/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantQueryOrderByAscendingKeyword/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantToStringCallForValueType/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantTypeArgumentsInsideNameof/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveConstructorInvocation/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceSequenceEqualWithConstantPattern/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithFieldKeyword/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ReplaceWithPrimaryConstructorParameter/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyStringComparison/@EntryIndexedValue">WARNING</s:String>
diff --git a/src/Examples/DapperExample/TranslationToSql/TreeNodes/TableSourceNode.cs b/src/Examples/DapperExample/TranslationToSql/TreeNodes/TableSourceNode.cs
@@ -7,7 +7,7 @@ namespace DapperExample.TranslationToSql.TreeNodes;
 /// </summary>
 internal abstract class TableSourceNode(string? alias) : SqlTreeNode
 {
-    public const string IdColumnName = nameof(Identifiable<object>.Id);
+    public const string IdColumnName = nameof(Identifiable<>.Id);
 
     public abstract IReadOnlyList<ColumnNode> Columns { get; }
     public string? Alias { get; } = alias;
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/DocumentationOpenApiOperationFilter.cs
@@ -5,7 +5,6 @@
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.Swashbuckle.JsonApiMetadata.ActionMethods;
-using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.Net.Http.Headers;
@@ -19,15 +18,15 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
 [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
 internal sealed class DocumentationOpenApiOperationFilter : IOperationFilter
 {
-    private const string GetPrimaryName = nameof(BaseJsonApiController<Identifiable<int>, int>.GetAsync);
-    private const string GetSecondaryName = nameof(BaseJsonApiController<Identifiable<int>, int>.GetSecondaryAsync);
-    private const string GetRelationshipName = nameof(BaseJsonApiController<Identifiable<int>, int>.GetRelationshipAsync);
-    private const string PostResourceName = nameof(BaseJsonApiController<Identifiable<int>, int>.PostAsync);
-    private const string PostRelationshipName = nameof(BaseJsonApiController<Identifiable<int>, int>.PostRelationshipAsync);
-    private const string PatchResourceName = nameof(BaseJsonApiController<Identifiable<int>, int>.PatchAsync);
-    private const string PatchRelationshipName = nameof(BaseJsonApiController<Identifiable<int>, int>.PatchRelationshipAsync);
-    private const string DeleteResourceName = nameof(BaseJsonApiController<Identifiable<int>, int>.DeleteAsync);
-    private const string DeleteRelationshipName = nameof(BaseJsonApiController<Identifiable<int>, int>.DeleteRelationshipAsync);
+    private const string GetPrimaryName = nameof(BaseJsonApiController<,>.GetAsync);
+    private const string GetSecondaryName = nameof(BaseJsonApiController<,>.GetSecondaryAsync);
+    private const string GetRelationshipName = nameof(BaseJsonApiController<,>.GetRelationshipAsync);
+    private const string PostResourceName = nameof(BaseJsonApiController<,>.PostAsync);
+    private const string PostRelationshipName = nameof(BaseJsonApiController<,>.PostRelationshipAsync);
+    private const string PatchResourceName = nameof(BaseJsonApiController<,>.PatchAsync);
+    private const string PatchRelationshipName = nameof(BaseJsonApiController<,>.PatchRelationshipAsync);
+    private const string DeleteResourceName = nameof(BaseJsonApiController<,>.DeleteAsync);
+    private const string DeleteRelationshipName = nameof(BaseJsonApiController<,>.DeleteRelationshipAsync);
     private const string PostOperationsName = nameof(BaseJsonApiOperationsController.PostOperationsAsync);
 
     private const string TextCompareETag =
diff --git a/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs b/src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/JsonApiDataContractResolver.cs
@@ -63,7 +63,7 @@ private List<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type reso
 
         foreach (DataProperty? property in dataContract.ObjectProperties)
         {
-            if (property.MemberInfo.Name == nameof(Identifiable<object>.Id))
+            if (property.MemberInfo.Name == nameof(Identifiable<>.Id))
             {
                 // Schemas of JsonApiDotNetCore resources will obtain an Id property through inheritance of a resource identifier type.
                 continue;
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs b/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs
@@ -61,7 +61,7 @@ private IServiceProvider GetScopedServiceProvider()
 
     private static bool IsId(string key)
     {
-        return key == nameof(Identifiable<object>.Id) || key.EndsWith($".{nameof(Identifiable<object>.Id)}", StringComparison.Ordinal);
+        return key == nameof(Identifiable<>.Id) || key.EndsWith($".{nameof(Identifiable<>.Id)}", StringComparison.Ordinal);
     }
 
     private static bool IsAtPrimaryEndpoint(IJsonApiRequest request)
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
@@ -299,7 +299,7 @@ private Dictionary<string, AttrAttribute>.ValueCollection GetAttributes(Type res
 
             if (attribute == null)
             {
-                if (property.Name == nameof(Identifiable<object>.Id))
+                if (property.Name == nameof(Identifiable<>.Id))
                 {
                     // Although strictly not correct, 'id' is added to the list of attributes for convenience.
                     // For example, it enables to filter on ID, without the need to special-case existing logic.
diff --git a/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs b/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
@@ -134,7 +134,7 @@ private static List<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<st
 
     private static string? ResolveSourcePointerInAttribute(PropertySegment segment, AttrAttribute attribute, IResourceGraph resourceGraph)
     {
-        string sourcePointer = attribute.Property.Name == nameof(Identifiable<object>.Id)
+        string sourcePointer = attribute.Property.Name == nameof(Identifiable<>.Id)
             ? $"{segment.SourcePointer ?? "/data"}/{attribute.PublicName}"
             : $"{segment.SourcePointer ?? "/data"}/attributes/{attribute.PublicName}";
 
diff --git a/src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs b/src/JsonApiDotNetCore/Queries/Parsing/FilterParser.cs
@@ -539,7 +539,7 @@ protected virtual ConstantValueConverter GetConstantValueConverterForType(Type d
 
     private ConstantValueConverter GetConstantValueConverterForAttribute(AttrAttribute attribute)
     {
-        if (attribute is { Property.Name: nameof(Identifiable<object>.Id) })
+        if (attribute is { Property.Name: nameof(Identifiable<>.Id) })
         {
             return (stringValue, position) =>
             {
diff --git a/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/QueryLayerComposer.cs
@@ -620,6 +620,6 @@ protected virtual PaginationExpression GetPagination(IReadOnlyCollection<QueryEx
 
     private static AttrAttribute GetIdAttribute(ResourceType resourceType)
     {
-        return resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+        return resourceType.GetAttributeByPropertyName(nameof(Identifiable<>.Id));
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/SparseFieldSetCache.cs b/src/JsonApiDotNetCore/Queries/SparseFieldSetCache.cs
@@ -94,7 +94,7 @@ public IImmutableSet<AttrAttribute> GetIdAttributeSetForRelationshipQuery(Resour
     {
         ArgumentNullException.ThrowIfNull(resourceType);
 
-        AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+        AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<>.Id));
         var inputExpression = new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
 
         // Intentionally not cached, as we are fetching ID only (ignoring any sparse fieldset that came from query string).
diff --git a/src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/SparseFieldSetQueryStringParameterReader.cs
@@ -85,7 +85,7 @@ private SparseFieldSetExpression GetSparseFieldSet(string parameterValue, Resour
         if (sparseFieldSet == null)
         {
             // We add ID to an incoming empty fieldset, so that callers can distinguish between no fieldset and an empty one.
-            AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+            AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<>.Id));
             return new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
         }
 
diff --git a/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs b/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs
@@ -4,7 +4,7 @@ namespace JsonApiDotNetCore.Resources;
 
 internal static class IdentifiableExtensions
 {
-    private const string IdPropertyName = nameof(Identifiable<object>.Id);
+    private const string IdPropertyName = nameof(Identifiable<>.Id);
 
     public static object GetTypedId(this IIdentifiable identifiable)
     {
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
@@ -204,7 +204,7 @@ public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConver
                     {
                         object? attributeValue;
 
-                        if (property.Name == nameof(Identifiable<object>.Id))
+                        if (property.Name == nameof(Identifiable<>.Id))
                         {
                             attributeValue = JsonInvalidAttributeInfo.Id;
                         }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
@@ -22,11 +22,11 @@ public class LinkBuilder : ILinkBuilder
     private const string PageSizeParameterName = "page[size]";
     private const string PageNumberParameterName = "page[number]";
 
-    private static readonly string GetPrimaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetAsync));
-    private static readonly string GetSecondaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetSecondaryAsync));
+    private static readonly string GetPrimaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<,>.GetAsync));
+    private static readonly string GetSecondaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<,>.GetSecondaryAsync));
 
     private static readonly string GetRelationshipControllerActionName =
-        NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetRelationshipAsync));
+        NoAsyncSuffix(nameof(BaseJsonApiController<,>.GetRelationshipAsync));
 
     private static readonly UriNormalizer UriNormalizer = new();
 
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs b/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs
@@ -247,7 +247,7 @@ protected virtual ResourceObject ConvertResource(IIdentifiable resource, Resourc
 
         foreach (AttrAttribute attr in resourceType.Attributes)
         {
-            if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<object>.Id))
+            if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<>.Id))
             {
                 continue;
             }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs
@@ -75,7 +75,7 @@ public CarExpressionRewriter(IResourceGraph resourceGraph)
 
     private static bool IsCarId(PropertyInfo property)
     {
-        return property.Name == nameof(Identifiable<object>.Id) && property.DeclaringType == typeof(Car);
+        return property.Name == nameof(Identifiable<>.Id) && property.DeclaringType == typeof(Car);
     }
 
     private QueryExpression RewriteFilterOnCarStringIds(ResourceFieldChainExpression existingCarIdChain, IEnumerable<string> carStringIds)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs
@@ -9,8 +9,6 @@ namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
 [Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
 public sealed class Building : Identifiable<int>
 {
-    private string? _tempPrimaryDoorColor;
-
     [Attr]
     public string Number { get; set; } = null!;
 
@@ -24,7 +22,7 @@ public string PrimaryDoorColor
     {
         get
         {
-            if (_tempPrimaryDoorColor == null && PrimaryDoor == null)
+            if (field == null && PrimaryDoor == null)
             {
                 // The ASP.NET model validator reads the value of this required property, to ensure it is not null.
                 // When creating a resource, BuildingDefinition ensures a value is assigned. But when updating a resource
@@ -33,15 +31,15 @@ public string PrimaryDoorColor
                 return null!;
             }
 
-            return _tempPrimaryDoorColor ?? PrimaryDoor!.Color;
+            return field ?? PrimaryDoor!.Color;
         }
         set
         {
             if (PrimaryDoor == null)
             {
                 // A request body is being deserialized. At this time, related entities have not been loaded yet.
                 // We cache the assigned value in a private field, so it can be used later.
-                _tempPrimaryDoorColor = value;
+                field = value;
             }
             else
             {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
@@ -112,7 +112,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             workItemInDatabase.DueAt.Should().Be(newWorkItem.DueAt);
         });
 
-        PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<int>();
     }
@@ -160,7 +160,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             userAccountInDatabase.LastName.Should().Be(newUserAccount.LastName);
         });
 
-        PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<long>();
     }
@@ -205,7 +205,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             groupInDatabase.Name.Should().Be(newGroup.Name);
         });
 
-        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<Guid>();
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -78,7 +78,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             groupInDatabase.Name.Should().Be(groupName);
         });
 
-        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<Guid>();
     }
@@ -132,7 +132,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             groupInDatabase.Name.Should().Be(groupName);
         });
 
-        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<Guid>();
     }
@@ -183,7 +183,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
         });
 
-        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<string>();
     }
@@ -234,7 +234,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
         });
 
-        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<string>();
     }
@@ -290,7 +290,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             colorInDatabase.DisplayName.Should().Be(defaultName);
         });
 
-        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<string>();
     }
@@ -473,7 +473,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
         });
 
-        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<string>();
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -325,7 +325,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             groupInDatabase.IsPublic.Should().Be(existingGroup.IsPublic);
         });
 
-        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<Guid>();
     }
@@ -373,7 +373,7 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
             colorInDatabase.DisplayName.Should().Be(newDisplayName);
         });
 
-        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<>.Id));
         property.Should().NotBeNull();
         property.PropertyType.Should().Be<string>();
     }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs
@@ -413,7 +413,7 @@ public void Can_override_capabilities_on_Id_property()
         IResourceGraph resourceGraph = builder.Build();
         ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithIdOverride>();
 
-        AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+        AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<>.Id));
         idAttribute.Capabilities.Should().Be(AttrCapabilities.AllowFilter);
     }
 
diff --git a/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs b/test/OpenApiNSwagClientTests/ChangeTracking/SerializerChangeTrackingTests.cs
@@ -802,13 +802,11 @@ public async Task Can_track_multiple_times_in_same_request_document()
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     private sealed class ComplexType : NotifyPropertySet
     {
-        private DateTime? _nullableDateTime;
-
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)]
         public DateTime? NullableDateTime
         {
-            get => _nullableDateTime;
-            set => SetProperty(ref _nullableDateTime, value);
+            get;
+            set => SetProperty(ref field, value);
         }
 
         public NestedType? NestedType { get; set; }
@@ -817,21 +815,18 @@ public DateTime? NullableDateTime
     [UsedImplicitly(ImplicitUseTargetFlags.Members)]
     private sealed class NestedType : NotifyPropertySet
     {
-        private int? _nullableInt;
-        private string? _nullableString;
-
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)]
         public int? NullableInt
         {
-            get => _nullableInt;
-            set => SetProperty(ref _nullableInt, value);
+            get;
+            set => SetProperty(ref field, value);
         }
 
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore, DefaultValueHandling = DefaultValueHandling.Ignore)]
         public string? NullableString
         {
-            get => _nullableString;
-            set => SetProperty(ref _nullableString, value);
+            get;
+            set => SetProperty(ref field, value);
         }
     }
 
diff --git a/test/TestBuildingBlocks/Unknown.cs b/test/TestBuildingBlocks/Unknown.cs

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace DapperExample.TranslationToSql.TreeNodes;`
`7`	`7`	`/// </summary>`
`8`	`8`	`internal abstract class TableSourceNode(string? alias) : SqlTreeNode`
`9`	`9`	`{`
`10`		`- public const string IdColumnName = nameof(Identifiable<object>.Id);`
	`10`	`+ public const string IdColumnName = nameof(Identifiable<>.Id);`
`11`	`11`
`12`	`12`	`public abstract IReadOnlyList<ColumnNode> Columns { get; }`
`13`	`13`	`public string? Alias { get; } = alias;`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ private List<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type reso`
`63`	`63`
`64`	`64`	`foreach (DataProperty? property in dataContract.ObjectProperties)`
`65`	`65`	`{`
`66`		`- if (property.MemberInfo.Name == nameof(Identifiable<object>.Id))`
	`66`	`+ if (property.MemberInfo.Name == nameof(Identifiable<>.Id))`
`67`	`67`	`{`
`68`	`68`	`// Schemas of JsonApiDotNetCore resources will obtain an Id property through inheritance of a resource identifier type.`
`69`	`69`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private IServiceProvider GetScopedServiceProvider()`
`61`	`61`
`62`	`62`	`private static bool IsId(string key)`
`63`	`63`	`{`
`64`		`- return key == nameof(Identifiable<object>.Id) \|\| key.EndsWith($".{nameof(Identifiable<object>.Id)}", StringComparison.Ordinal);`
	`64`	`+ return key == nameof(Identifiable<>.Id) \|\| key.EndsWith($".{nameof(Identifiable<>.Id)}", StringComparison.Ordinal);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`private static bool IsAtPrimaryEndpoint(IJsonApiRequest request)`
Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ private Dictionary<string, AttrAttribute>.ValueCollection GetAttributes(Type res`
`299`	`299`
`300`	`300`	`if (attribute == null)`
`301`	`301`	`{`
`302`		`- if (property.Name == nameof(Identifiable<object>.Id))`
	`302`	`+ if (property.Name == nameof(Identifiable<>.Id))`
`303`	`303`	`{`
`304`	`304`	`// Although strictly not correct, 'id' is added to the list of attributes for convenience.`
`305`	`305`	`// For example, it enables to filter on ID, without the need to special-case existing logic.`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private static List<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<st`
`134`	`134`
`135`	`135`	`private static string? ResolveSourcePointerInAttribute(PropertySegment segment, AttrAttribute attribute, IResourceGraph resourceGraph)`
`136`	`136`	`{`
`137`		`- string sourcePointer = attribute.Property.Name == nameof(Identifiable<object>.Id)`
	`137`	`+ string sourcePointer = attribute.Property.Name == nameof(Identifiable<>.Id)`
`138`	`138`	`? $"{segment.SourcePointer ?? "/data"}/{attribute.PublicName}"`
`139`	`139`	`: $"{segment.SourcePointer ?? "/data"}/attributes/{attribute.PublicName}";`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -539,7 +539,7 @@ protected virtual ConstantValueConverter GetConstantValueConverterForType(Type d`
`539`	`539`
`540`	`540`	`private ConstantValueConverter GetConstantValueConverterForAttribute(AttrAttribute attribute)`
`541`	`541`	`{`
`542`		`- if (attribute is { Property.Name: nameof(Identifiable<object>.Id) })`
	`542`	`+ if (attribute is { Property.Name: nameof(Identifiable<>.Id) })`
`543`	`543`	`{`
`544`	`544`	`return (stringValue, position) =>`
`545`	`545`	`{`
Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,6 @@ protected virtual PaginationExpression GetPagination(IReadOnlyCollection<QueryEx`
`620`	`620`
`621`	`621`	`private static AttrAttribute GetIdAttribute(ResourceType resourceType)`
`622`	`622`	`{`
`623`		`- return resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));`
	`623`	`+ return resourceType.GetAttributeByPropertyName(nameof(Identifiable<>.Id));`
`624`	`624`	`}`
`625`	`625`	`}`