Updated to latest Resharper version and removed workarounds for earlier versions

Author: Bart Koelman

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.2.2",
+      "version": "2021.3.0-eap10",
       "commands": [
         "jb"
       ]

JsonApiDotNetCore.sln.DotSettings

@@ -91,6 +91,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/PARENTHESES_GROUP_NON_OBVIOUS_OPERATIONS/@EntryValue">Conditional</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_STATEMENT_CONDITIONS/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_MULTILINE_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_LOCAL_METHOD/@EntryValue">1</s:Int64>

src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs

@@ -281,7 +281,7 @@ private IReadOnlyCollection<EagerLoadAttribute> GetEagerLoads(Type resourceClrTy
         private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName, TField field)
             where TField : ResourceFieldAttribute
         {
-            if (fieldsByName.TryGetValue(field.PublicName, out var existingField))
+            if (fieldsByName.TryGetValue(field.PublicName, out TField? existingField))
             {
                 throw CreateExceptionForDuplicatePublicName(field.Property.DeclaringType!, existingField, field);
             }
@@ -291,7 +291,7 @@ private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName
 
         private void AssertNoDuplicatePublicName(ResourceType resourceType, string effectivePublicName)
         {
-            var (existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
+            (Type? existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
 
             if (existingClrType != null)
             {

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs

@@ -8,7 +8,6 @@
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
 namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding

src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs

@@ -7,7 +7,8 @@
 namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
 {
     /// <summary>
-    /// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and <see cref="Queryable.Take{TSource}" /> calls.
+    /// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and
+    /// <see cref="Queryable.Take{TSource}(IQueryable{TSource},int)" /> calls.
     /// </summary>
     [PublicAPI]
     public class SkipTakeClauseBuilder : QueryClauseBuilder<object?>

src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs

@@ -17,8 +17,6 @@ public readonly struct SingleOrManyData<T>
         // to ensure ManyValue never contains null items.
         where T : class, IResourceIdentity, new()
     {
-        // ReSharper disable once MergeConditionalExpression
-        // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
         public object? Value => ManyValue != null ? ManyValue : SingleValue;
 
         [JsonIgnore]

src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs

@@ -69,10 +69,7 @@ private WriteOperationKind ConvertOperationCode(AtomicOperationObject atomicOper
             {
                 case AtomicOperationCode.Add:
                 {
-                    // ReSharper disable once MergeIntoPattern
-                    // Justification: Merging this into a pattern crashes the command-line versions of CleanupCode/InspectCode.
-                    // Tracked at: https://youtrack.jetbrains.com/issue/RSRP-486717
-                    if (atomicOperationObject.Ref != null && atomicOperationObject.Ref.Relationship == null)
+                    if (atomicOperationObject.Ref is { Relationship: null })
                     {
                         using IDisposable _ = state.Position.PushElement("ref");
                         throw new ModelConversionException(state.Position, "The 'relationship' element is required.", null);

src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs

@@ -187,8 +187,6 @@ public IList<ResourceObject> GetResponseIncluded()
 
         private IList<ResourceObjectTreeNode> GetDirectChildren()
         {
-            // ReSharper disable once MergeConditionalExpression
-            // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
             return _directChildren == null ? Array.Empty<ResourceObjectTreeNode>() : _directChildren;
         }
 

test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs

@@ -5,7 +5,6 @@
 using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
-using FluentAssertions.Common;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;

test/SourceGeneratorTests/CompilationBuilder.cs

@@ -35,11 +35,11 @@ public CompilationBuilder WithSystemReferences()
             PortableExecutableReference systemRuntimeReference =
                 MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(objectLocation)!, "System.Runtime.dll"));
 
-            foreach (var reference in new[]
-            {
-                MetadataReference.CreateFromFile(objectLocation),
-                systemRuntimeReference
-            })
+            foreach (PortableExecutableReference reference in new[]
+                {
+                    MetadataReference.CreateFromFile(objectLocation),
+                    systemRuntimeReference
+                })
             {
                 _references.Add(reference);
             }
@@ -57,11 +57,11 @@ public CompilationBuilder WithLoggerFactoryReference()
 
         public CompilationBuilder WithJsonApiDotNetCoreReferences()
         {
-            foreach (var reference in new[]
-            {
-                MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location),
-                MetadataReference.CreateFromFile(typeof(AttrAttribute).Assembly.Location)
-            })
+            foreach (PortableExecutableReference reference in new[]
+                {
+                    MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location),
+                    MetadataReference.CreateFromFile(typeof(AttrAttribute).Assembly.Location)
+                })
             {
                 _references.Add(reference);
             }

test/SourceGeneratorTests/SourceCodeBuilder.cs

@@ -17,7 +17,7 @@ public string Build()
 
             if (_namespaceImports.Any())
             {
-                foreach (var namespaceImport in _namespaceImports)
+                foreach (string namespaceImport in _namespaceImports)
                 {
                     builder.AppendLine($"using {namespaceImport};");
                 }