File tree 4 files changed +8
-6
lines changed
src/JsonApiDotNetCore/Configuration
4 files changed +8
-6
lines changed Original file line number Diff line number Diff line change 3
3
"isRoot" : true ,
4
4
"tools" : {
5
5
"jetbrains.resharper.globaltools" : {
6
- "version" : " 2021.3.4 " ,
6
+ "version" : " 2022.2.3 " ,
7
7
"commands" : [
8
8
" jb"
9
9
]
Original file line number Diff line number Diff line change @@ -105,8 +105,11 @@ CheckLastExitCode
105
105
dotnet build - c Release
106
106
CheckLastExitCode
107
107
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
+ }
110
113
111
114
dotnet test - c Release -- no- build -- collect:" XPlat Code Coverage"
112
115
CheckLastExitCode
Original file line number Diff line number Diff line change @@ -317,7 +317,7 @@ private IReadOnlyCollection<RelationshipAttribute> GetRelationships(Type resourc
317
317
318
318
private void SetPublicName ( ResourceFieldAttribute field , PropertyInfo property )
319
319
{
320
- // ReSharper disable once ConstantNullCoalescingCondition
320
+ // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
321
321
field . PublicName ??= FormatPropertyName ( property ) ;
322
322
}
323
323
Original file line number Diff line number Diff line change @@ -79,8 +79,7 @@ public abstract class IntegrationTest
79
79
80
80
private string ? SerializeRequest ( object ? requestBody )
81
81
{
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 ) ;
84
83
}
85
84
86
85
protected abstract HttpClient CreateClient ( ) ;
You can’t perform that action at this time.
0 commit comments