Skip to content

Commit 9b96a42

Browse files
committed
Update to latest Resharper version
1 parent 6b69ed3 commit 9b96a42

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"jetbrains.resharper.globaltools": {
6-
"version": "2021.3.4",
6+
"version": "2022.2.3",
77
"commands": [
88
"jb"
99
]

Build.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,11 @@ CheckLastExitCode
105105
dotnet build -c Release
106106
CheckLastExitCode
107107

108-
RunInspectCode
109-
RunCleanupCode
108+
# https://youtrack.jetbrains.com/issue/RSRP-488628/Breaking-InspectCode-fails-with-Roslyn-Worker-process-exited-unexpectedly-after-update
109+
if ($env:APPVEYOR_BUILD_WORKER_IMAGE -ne 'Ubuntu') {
110+
RunInspectCode
111+
RunCleanupCode
112+
}
110113

111114
dotnet test -c Release --no-build --collect:"XPlat Code Coverage"
112115
CheckLastExitCode

src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ private IReadOnlyCollection<RelationshipAttribute> GetRelationships(Type resourc
317317

318318
private void SetPublicName(ResourceFieldAttribute field, PropertyInfo property)
319319
{
320-
// ReSharper disable once ConstantNullCoalescingCondition
320+
// ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
321321
field.PublicName ??= FormatPropertyName(property);
322322
}
323323

test/TestBuildingBlocks/IntegrationTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public abstract class IntegrationTest
7979

8080
private string? SerializeRequest(object? requestBody)
8181
{
82-
return requestBody == null ? null :
83-
requestBody is string stringRequestBody ? stringRequestBody : JsonSerializer.Serialize(requestBody, SerializerOptions);
82+
return requestBody == null ? null : requestBody as string ?? JsonSerializer.Serialize(requestBody, SerializerOptions);
8483
}
8584

8685
protected abstract HttpClient CreateClient();

0 commit comments

Comments
 (0)