Partial revert of update to Resharper/Rider v2021.2.0

Bart Koelman · Bart Koelman · commit 8f8f8f67b4be · 2021-08-13T10:47:06.000+02:00
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.2.0",
+      "version": "2021.1.4",
       "commands": [
         "jb"
       ]
diff --git a/Build.ps1 b/Build.ps1
@@ -8,7 +8,7 @@ function CheckLastExitCode {
 
 function RunInspectCode {
     $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
-    dotnet jb inspectcode JsonApiDotNetCore.sln --debug --no-build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=TRACE -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
+    dotnet jb inspectcode JsonApiDotNetCore.sln --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
     CheckLastExitCode
 
     [xml]$xml = Get-Content "$outputPath"
@@ -47,7 +47,7 @@ function RunCleanupCode {
         $mergeCommitHash = git rev-parse "HEAD"
         $targetCommitHash = git rev-parse "$env:APPVEYOR_REPO_BRANCH"
 
-        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=TRACE --jb --debug -f commits -a $mergeCommitHash -b $targetCommitHash --fail-on-diff --print-diff
+        dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $mergeCommitHash -b $targetCommitHash --fail-on-diff --print-diff
         CheckLastExitCode
     }
 }
diff --git a/cleanupcode.ps1 b/cleanupcode.ps1
@@ -8,10 +8,10 @@ if ($LASTEXITCODE -ne 0) {
     throw "Tool restore failed with exit code $LASTEXITCODE"
 }
 
-dotnet restore
+dotnet build -c Release
 
 if ($LASTEXITCODE -ne 0) {
-    throw "Package restore failed with exit code $LASTEXITCODE"
+    throw "Build failed with exit code $LASTEXITCODE"
 }
 
 dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN
diff --git a/inspectcode.ps1 b/inspectcode.ps1
@@ -8,9 +8,15 @@ if ($LASTEXITCODE -ne 0) {
     throw "Tool restore failed with exit code $LASTEXITCODE"
 }
 
+dotnet build -c Release
+
+if ($LASTEXITCODE -ne 0) {
+    throw "Build failed with exit code $LASTEXITCODE"
+}
+
 $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
 $resultPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.html')
-dotnet jb inspectcode JsonApiDotNetCore.sln --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
+dotnet jb inspectcode JsonApiDotNetCore.sln --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
 
 if ($LASTEXITCODE -ne 0) {
     throw "Code inspection failed with exit code $LASTEXITCODE"
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs b/src/Examples/JsonApiDotNetCoreExample/Startups/EmptyStartup.cs
@@ -15,6 +15,8 @@ public virtual void ConfigureServices(IServiceCollection services)
         {
         }
 
+        // ReSharper disable once UnusedMemberInSuper.Global
+        // ReSharper disable once UnusedParameter.Global
         public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
         {
         }
diff --git a/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs b/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs
@@ -19,7 +19,7 @@ public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRe
 
         private static Error CreateError(MissingResourceInRelationship missingResourceInRelationship)
         {
-            return new Error(HttpStatusCode.NotFound)
+            return new(HttpStatusCode.NotFound)
             {
                 Title = "A related resource does not exist.",
                 Detail = $"Related resource of type '{missingResourceInRelationship.ResourceType}' with ID '{missingResourceInRelationship.ResourceId}' " +
diff --git a/src/JsonApiDotNetCore/ObjectExtensions.cs b/src/JsonApiDotNetCore/ObjectExtensions.cs
@@ -21,15 +21,15 @@ public static T[] AsArray<T>(this T element)
 
         public static List<T> AsList<T>(this T element)
         {
-            return new List<T>
+            return new()
             {
                 element
             };
         }
 
         public static HashSet<T> AsHashSet<T>(this T element)
         {
-            return new HashSet<T>
+            return new()
             {
                 element
             };
diff --git a/src/JsonApiDotNetCore/Serialization/Building/ResourceObjectBuilderSettingsProvider.cs b/src/JsonApiDotNetCore/Serialization/Building/ResourceObjectBuilderSettingsProvider.cs
@@ -24,7 +24,7 @@ public ResourceObjectBuilderSettingsProvider(IDefaultsQueryStringParameterReader
         /// <inheritdoc />
         public ResourceObjectBuilderSettings Get()
         {
-            return new ResourceObjectBuilderSettings(_nullsReader.SerializerNullValueHandling, _defaultsReader.SerializerDefaultValueHandling);
+            return new(_nullsReader.SerializerNullValueHandling, _defaultsReader.SerializerDefaultValueHandling);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs
@@ -24,7 +24,7 @@ public MusicTrackReleaseDefinition(IResourceGraph resourceGraph, ISystemClock sy
 
         public override QueryStringParameterHandlers<MusicTrack> OnRegisterQueryableHandlersForQueryStringParameters()
         {
-            return new QueryStringParameterHandlers<MusicTrack>
+            return new()
             {
                 ["isRecentlyReleased"] = FilterOnRecentlyReleased
             };
diff --git a/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs b/test/JsonApiDotNetCoreExampleTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs
@@ -22,7 +22,7 @@ public T GetContentAs<T>()
 
         public static OutgoingMessage CreateFromContent(IMessageContent content)
         {
-            return new OutgoingMessage
+            return new()
             {
                 Type = content.GetType().Name,
                 FormatVersion = content.FormatVersion,
diff --git a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
@@ -14,7 +14,7 @@ public static class HttpResponseMessageExtensions
     {
         public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)
         {
-            return new HttpResponseMessageAssertions(instance);
+            return new(instance);
         }
 
         public sealed class HttpResponseMessageAssertions : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>
diff --git a/test/UnitTests/Middleware/JsonApiMiddlewareTests.cs b/test/UnitTests/Middleware/JsonApiMiddlewareTests.cs
@@ -135,17 +135,9 @@ private static Mock<IJsonApiOptions> CreateMockOptions(string forcedNamespace)
 
         private static DefaultHttpContext CreateHttpContext(string path, bool isRelationship = false, string action = "", string id = null)
         {
-            var context = new DefaultHttpContext
-            {
-                Request =
-                {
-                    Path = new PathString(path)
-                },
-                Response =
-                {
-                    Body = new MemoryStream()
-                }
-            };
+            var context = new DefaultHttpContext();
+            context.Request.Path = new PathString(path);
+            context.Response.Body = new MemoryStream();
 
             var feature = new RouteValuesFeature
             {
diff --git a/test/UnitTests/Serialization/DeserializerTestsSetup.cs b/test/UnitTests/Serialization/DeserializerTestsSetup.cs
@@ -30,7 +30,7 @@ protected Document CreateDocumentWithRelationships(string primaryType, string re
 
         protected Document CreateDocumentWithRelationships(string primaryType)
         {
-            return new Document
+            return new()
             {
                 Data = new ResourceObject
                 {
@@ -67,7 +67,7 @@ protected RelationshipEntry CreateRelationshipData(string relatedType = null, bo
 
         protected Document CreateTestResourceDocument()
         {
-            return new Document
+            return new()
             {
                 Data = new ResourceObject
                 {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"isRoot": true,`
`4`	`4`	`"tools": {`
`5`	`5`	`"jetbrains.resharper.globaltools": {`
`6`		`- "version": "2021.2.0",`
	`6`	`+ "version": "2021.1.4",`
`7`	`7`	`"commands": [`
`8`	`8`	`"jb"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ function CheckLastExitCode {`
`8`	`8`
`9`	`9`	`function RunInspectCode {`
`10`	`10`	`$outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')`
`11`		`- dotnet jb inspectcode JsonApiDotNetCore.sln --debug --no-build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=TRACE -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal`
	`11`	`+ dotnet jb inspectcode JsonApiDotNetCore.sln --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal`
`12`	`12`	`CheckLastExitCode`
`13`	`13`
`14`	`14`	`[xml]$xml = Get-Content "$outputPath"`
`@@ -47,7 +47,7 @@ function RunCleanupCode {`
`47`	`47`	`$mergeCommitHash = git rev-parse "HEAD"`
`48`	`48`	`$targetCommitHash = git rev-parse "$env:APPVEYOR_REPO_BRANCH"`
`49`	`49`
`50`		`- dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=TRACE --jb --debug -f commits -a $mergeCommitHash -b $targetCommitHash --fail-on-diff --print-diff`
	`50`	`+ dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $mergeCommitHash -b $targetCommitHash --fail-on-diff --print-diff`
`51`	`51`	`CheckLastExitCode`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,10 @@ if ($LASTEXITCODE -ne 0) {`
`8`	`8`	`throw "Tool restore failed with exit code $LASTEXITCODE"`
`9`	`9`	`}`
`10`	`10`
`11`		`-dotnet restore`
	`11`	`+dotnet build -c Release`
`12`	`12`
`13`	`13`	`if ($LASTEXITCODE -ne 0) {`
`14`		`- throw "Package restore failed with exit code $LASTEXITCODE"`
	`14`	`+ throw "Build failed with exit code $LASTEXITCODE"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ public virtual void ConfigureServices(IServiceCollection services)`
`15`	`15`	`{`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ // ReSharper disable once UnusedMemberInSuper.Global`
	`19`	`+ // ReSharper disable once UnusedParameter.Global`
`18`	`20`	`public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)`
`19`	`21`	`{`
`20`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRe`
`19`	`19`
`20`	`20`	`private static Error CreateError(MissingResourceInRelationship missingResourceInRelationship)`
`21`	`21`	`{`
`22`		`- return new Error(HttpStatusCode.NotFound)`
	`22`	`+ return new(HttpStatusCode.NotFound)`
`23`	`23`	`{`
`24`	`24`	`Title = "A related resource does not exist.",`
`25`	`25`	`Detail = $"Related resource of type '{missingResourceInRelationship.ResourceType}' with ID '{missingResourceInRelationship.ResourceId}' " +`
Original file line number	Diff line number	Diff line change
`@@ -21,15 +21,15 @@ public static T[] AsArray<T>(this T element)`
`21`	`21`
`22`	`22`	`public static List<T> AsList<T>(this T element)`
`23`	`23`	`{`
`24`		`- return new List<T>`
	`24`	`+ return new()`
`25`	`25`	`{`
`26`	`26`	`element`
`27`	`27`	`};`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`public static HashSet<T> AsHashSet<T>(this T element)`
`31`	`31`	`{`
`32`		`- return new HashSet<T>`
	`32`	`+ return new()`
`33`	`33`	`{`
`34`	`34`	`element`
`35`	`35`	`};`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public ResourceObjectBuilderSettingsProvider(IDefaultsQueryStringParameterReader`
`24`	`24`	`/// <inheritdoc />`
`25`	`25`	`public ResourceObjectBuilderSettings Get()`
`26`	`26`	`{`
`27`		`- return new ResourceObjectBuilderSettings(_nullsReader.SerializerNullValueHandling, _defaultsReader.SerializerDefaultValueHandling);`
	`27`	`+ return new(_nullsReader.SerializerNullValueHandling, _defaultsReader.SerializerDefaultValueHandling);`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public MusicTrackReleaseDefinition(IResourceGraph resourceGraph, ISystemClock sy`
`24`	`24`
`25`	`25`	`public override QueryStringParameterHandlers<MusicTrack> OnRegisterQueryableHandlersForQueryStringParameters()`
`26`	`26`	`{`
`27`		`- return new QueryStringParameterHandlers<MusicTrack>`
	`27`	`+ return new()`
`28`	`28`	`{`
`29`	`29`	`["isRecentlyReleased"] = FilterOnRecentlyReleased`
`30`	`30`	`};`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public T GetContentAs<T>()`
`22`	`22`
`23`	`23`	`public static OutgoingMessage CreateFromContent(IMessageContent content)`
`24`	`24`	`{`
`25`		`- return new OutgoingMessage`
	`25`	`+ return new()`
`26`	`26`	`{`
`27`	`27`	`Type = content.GetType().Name,`
`28`	`28`	`FormatVersion = content.FormatVersion,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public static class HttpResponseMessageExtensions`
`14`	`14`	`{`
`15`	`15`	`public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)`
`16`	`16`	`{`
`17`		`- return new HttpResponseMessageAssertions(instance);`
	`17`	`+ return new(instance);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public sealed class HttpResponseMessageAssertions : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>`