Skip to content

Commit 15c50c9

Browse files
committed
Update to .NET 11 Preview 2 and R# 2026.1.0-eap08
1 parent 70c23f8 commit 15c50c9

File tree

8 files changed

+6
-11
lines changed

8 files changed

+6
-11
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": "2026.1.0-eap06",
6+
"version": "2026.1.0-eap08",
77
"commands": [
88
"jb"
99
],

package-versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
77
<NewtonsoftJsonFrozenVersion>13.0.4</NewtonsoftJsonFrozenVersion>
88
<SwashbuckleFrozenVersion_NET8_9>10.1.5</SwashbuckleFrozenVersion_NET8_9>
9-
<SwashbuckleFrozenVersion_NET10_11>10.*-pr.3786.*</SwashbuckleFrozenVersion_NET10_11>
9+
<SwashbuckleFrozenVersion_NET10_11>*-pr.3786.*</SwashbuckleFrozenVersion_NET10_11>
1010
<SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>
1111

1212
<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->

src/JsonApiDotNetCore/AtomicOperations/Processors/AddToRelationshipProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public AddToRelationshipProcessor(IAddToRelationshipService<TResource, TId> serv
2626
var leftId = (TId)operation.Resource.GetTypedId();
2727
ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
2828

29-
await _service.AddToToManyRelationshipAsync(leftId!, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
29+
await _service.AddToToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
3030

3131
return null;
3232
}

src/JsonApiDotNetCore/AtomicOperations/Processors/DeleteProcessor.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ public DeleteProcessor(IDeleteService<TResource, TId> service)
2424
ArgumentNullException.ThrowIfNull(operation);
2525

2626
var id = (TId)operation.Resource.GetTypedId();
27-
#pragma warning disable CS8607 // A possible null value may not be used for a type marked with [NotNull] or [DisallowNull]
28-
// Justification: Temporary workaround for R# bug at https://youtrack.jetbrains.com/issue/RSRP-503026.
2927
await _service.DeleteAsync(id, cancellationToken);
30-
#pragma warning restore CS8607 // A possible null value may not be used for a type marked with [NotNull] or [DisallowNull]
3128

3229
return null;
3330
}

src/JsonApiDotNetCore/AtomicOperations/Processors/RemoveFromRelationshipProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public RemoveFromRelationshipProcessor(IRemoveFromRelationshipService<TResource,
2626
var leftId = (TId)operation.Resource.GetTypedId();
2727
ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
2828

29-
await _service.RemoveFromToManyRelationshipAsync(leftId!, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
29+
await _service.RemoveFromToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
3030

3131
return null;
3232
}

src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)
2727
var leftId = (TId)operation.Resource.GetTypedId();
2828
object? rightValue = GetRelationshipRightValue(operation);
2929

30-
await _service.SetRelationshipAsync(leftId!, operation.Request.Relationship!.PublicName, rightValue, cancellationToken);
30+
await _service.SetRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightValue, cancellationToken);
3131

3232
return null;
3333
}

test/OpenApiTests/OpenApiTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net11.0;net10.0;net9.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net11.0</TargetFrameworks>
44
<GenerateDocumentationFile>True</GenerateDocumentationFile>
55
<OpenApiGenerateDocuments>false</OpenApiGenerateDocuments>
66
<NoWarn>$(NoWarn);1591</NoWarn>

test/TestBuildingBlocks/CapturingLoggerProvider.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ public sealed class CapturingLoggerProvider : ILoggerProvider
1616
private static readonly Func<string, LogLevel, bool> DefaultFilter = (_, _) => true;
1717
private readonly Func<string, LogLevel, bool> _filter;
1818

19-
// ReSharper disable once ChangeFieldTypeToSystemThreadingLock
20-
// Justification: Workaround for bug https://youtrack.jetbrains.com/issue/RSRP-503024/Regression-Use-System.Threading.Lock-on-.NET-11.
2119
private readonly LockPrimitive _lockObject = new();
2220
private readonly List<LogMessage> _messages = [];
2321

0 commit comments

Comments
 (0)