Update to latest JetBrains tools

Bart Koelman · Bart Koelman · commit e444e96ecd4d · 2021-11-02T09:39:41.000+01:00
In the past, [cibuild hung after update to the latest version](#1045). Since then, the codebase has changed and a new minor version was released. These result in the cibuild no longer hanging. Stats from my laptop (old=v2021.1.4, new=v2021.2.2): ``` master, inspectcode (old): 2:59 master, inspectcode (new): 2:00 nrt, inspectcode (old): 3:04 nrt, inspectcode (new): 2:33 master, cleanupcode (old): 11:06 master, cleanupcode (new): 5:39 nrt, cleanupcode (old): 11:59 nrt, cleanupcode (new): 6:34 ``` So the newer versions got faster. And cleanupcode still takes the most time. In this PR, 722 of 1020 files have changed, which is 70% of the total codebase. Because during PR cibuild, we run cleanupcode only on changed files (in chunks), this PR takes very long and sometimes times out. This is an exceptional case, future PRs shouldn't touch so many files. So in the end, I believe this update is the best way forward.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.1.4",
+      "version": "2021.2.2",
       "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 --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
+    dotnet jb inspectcode JsonApiDotNetCore.sln --no-build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
     CheckLastExitCode
 
     [xml]$xml = Get-Content "$outputPath"
diff --git a/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs b/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs
@@ -276,7 +276,7 @@ public class OperationsDeserializationBenchmarks : DeserializationBenchmarkBase
 
         protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
         {
-            return new()
+            return new JsonApiRequest
             {
                 Kind = EndpointKind.AtomicOperations
             };
diff --git a/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs b/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs
@@ -139,7 +139,7 @@ public class ResourceDeserializationBenchmarks : DeserializationBenchmarkBase
 
         protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
         {
-            return new()
+            return new JsonApiRequest
             {
                 Kind = EndpointKind.Primary,
                 PrimaryResourceType = resourceGraph.GetResourceType<IncomingResource>(),
diff --git a/benchmarks/Serialization/OperationsSerializationBenchmarks.cs b/benchmarks/Serialization/OperationsSerializationBenchmarks.cs
@@ -122,7 +122,7 @@ public string SerializeOperationsResponse()
 
         protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
         {
-            return new()
+            return new JsonApiRequest
             {
                 Kind = EndpointKind.AtomicOperations,
                 PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
diff --git a/benchmarks/Serialization/ResourceSerializationBenchmarks.cs b/benchmarks/Serialization/ResourceSerializationBenchmarks.cs
@@ -113,7 +113,7 @@ public string SerializeResourceResponse()
 
         protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
         {
-            return new()
+            return new JsonApiRequest
             {
                 Kind = EndpointKind.Primary,
                 PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
diff --git a/benchmarks/Serialization/SerializationBenchmarkBase.cs b/benchmarks/Serialization/SerializationBenchmarkBase.cs
@@ -223,23 +223,23 @@ private sealed class FakeLinkBuilder : ILinkBuilder
         {
             public TopLevelLinks GetTopLevelLinks()
             {
-                return new()
+                return new TopLevelLinks
                 {
                     Self = "TopLevel:Self"
                 };
             }
 
             public ResourceLinks GetResourceLinks(ResourceType resourceType, string id)
             {
-                return new()
+                return new ResourceLinks
                 {
                     Self = "Resource:Self"
                 };
             }
 
             public RelationshipLinks GetRelationshipLinks(RelationshipAttribute relationship, string leftId)
             {
-                return new()
+                return new RelationshipLinks
                 {
                     Self = "Relationship:Self",
                     Related = "Relationship:Related"
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 build -c Release
+dotnet restore
 
 if ($LASTEXITCODE -ne 0) {
-    throw "Build failed with exit code $LASTEXITCODE"
+    throw "Package restore 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,15 +8,9 @@ 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 --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=SolutionPersonal -dsl=ProjectPersonal
+dotnet jb inspectcode JsonApiDotNetCore.sln --build --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/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs b/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs
@@ -19,7 +19,7 @@ public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRe
 
         private static ErrorObject CreateError(MissingResourceInRelationship missingResourceInRelationship)
         {
-            return new(HttpStatusCode.NotFound)
+            return new ErrorObject(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()
+            return new List<T>
             {
                 element
             };
         }
 
         public static HashSet<T> AsHashSet<T>(this T element)
         {
-            return new()
+            return new HashSet<T>
             {
                 element
             };
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs
@@ -29,7 +29,7 @@ protected static void WriteSubTree<TValue>(Utf8JsonWriter writer, TValue value,
 
         protected static JsonException GetEndOfStreamError()
         {
-            return new("Unexpected end of JSON stream.");
+            return new JsonException("Unexpected end of JSON stream.");
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs b/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
@@ -51,7 +51,7 @@ public ResourceObjectTreeNode(IIdentifiable resource, ResourceType type, Resourc
 
         public static ResourceObjectTreeNode CreateRoot()
         {
-            return new(RootResource, RootType, new ResourceObject());
+            return new ResourceObjectTreeNode(RootResource, RootType, new ResourceObject());
         }
 
         public void AttachDirectChild(ResourceObjectTreeNode treeNode)
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs
@@ -24,7 +24,7 @@ public MusicTrackReleaseDefinition(IResourceGraph resourceGraph, ISystemClock sy
 
         public override QueryStringParameterHandlers<MusicTrack> OnRegisterQueryableHandlersForQueryStringParameters()
         {
-            return new()
+            return new QueryStringParameterHandlers<MusicTrack>
             {
                 ["isRecentlyReleased"] = FilterOnRecentlyReleased
             };
diff --git a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
@@ -11,7 +11,7 @@ public static class HttpResponseMessageExtensions
     {
         public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)
         {
-            return new(instance);
+            return new HttpResponseMessageAssertions(instance);
         }
 
         public sealed class HttpResponseMessageAssertions : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>

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.1.4",`
	`6`	`+ "version": "2021.2.2",`
`7`	`7`	`"commands": [`
`8`	`8`	`"jb"`
`9`	`9`	`]`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ public class OperationsDeserializationBenchmarks : DeserializationBenchmarkBase`
`276`	`276`
`277`	`277`	`protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)`
`278`	`278`	`{`
`279`		`- return new()`
	`279`	`+ return new JsonApiRequest`
`280`	`280`	`{`
`281`	`281`	`Kind = EndpointKind.AtomicOperations`
`282`	`282`	`};`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public class ResourceDeserializationBenchmarks : DeserializationBenchmarkBase`
`139`	`139`
`140`	`140`	`protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)`
`141`	`141`	`{`
`142`		`- return new()`
	`142`	`+ return new JsonApiRequest`
`143`	`143`	`{`
`144`	`144`	`Kind = EndpointKind.Primary,`
`145`	`145`	`PrimaryResourceType = resourceGraph.GetResourceType<IncomingResource>(),`
Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ public string SerializeOperationsResponse()`
`122`	`122`
`123`	`123`	`protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)`
`124`	`124`	`{`
`125`		`- return new()`
	`125`	`+ return new JsonApiRequest`
`126`	`126`	`{`
`127`	`127`	`Kind = EndpointKind.AtomicOperations,`
`128`	`128`	`PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ public string SerializeResourceResponse()`
`113`	`113`
`114`	`114`	`protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)`
`115`	`115`	`{`
`116`		`- return new()`
	`116`	`+ return new JsonApiRequest`
`117`	`117`	`{`
`118`	`118`	`Kind = EndpointKind.Primary,`
`119`	`119`	`PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()`
Original file line number	Diff line number	Diff line change
`@@ -223,23 +223,23 @@ private sealed class FakeLinkBuilder : ILinkBuilder`
`223`	`223`	`{`
`224`	`224`	`public TopLevelLinks GetTopLevelLinks()`
`225`	`225`	`{`
`226`		`- return new()`
	`226`	`+ return new TopLevelLinks`
`227`	`227`	`{`
`228`	`228`	`Self = "TopLevel:Self"`
`229`	`229`	`};`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`public ResourceLinks GetResourceLinks(ResourceType resourceType, string id)`
`233`	`233`	`{`
`234`		`- return new()`
	`234`	`+ return new ResourceLinks`
`235`	`235`	`{`
`236`	`236`	`Self = "Resource:Self"`
`237`	`237`	`};`
`238`	`238`	`}`
`239`	`239`
`240`	`240`	`public RelationshipLinks GetRelationshipLinks(RelationshipAttribute relationship, string leftId)`
`241`	`241`	`{`
`242`		`- return new()`
	`242`	`+ return new RelationshipLinks`
`243`	`243`	`{`
`244`	`244`	`Self = "Relationship:Self",`
`245`	`245`	`Related = "Relationship:Related"`
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 build -c Release`
	`11`	`+dotnet restore`
`12`	`12`
`13`	`13`	`if ($LASTEXITCODE -ne 0) {`
`14`		`- throw "Build failed with exit code $LASTEXITCODE"`
	`14`	`+ throw "Package restore 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
`@@ -19,7 +19,7 @@ public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRe`
`19`	`19`
`20`	`20`	`private static ErrorObject CreateError(MissingResourceInRelationship missingResourceInRelationship)`
`21`	`21`	`{`
`22`		`- return new(HttpStatusCode.NotFound)`
	`22`	`+ return new ErrorObject(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}' " +`