Skip to content

Commit 49af5c5

Browse files
committed
Updates for RC2
1 parent 81ecbfe commit 49af5c5

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
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": "2025.2.3",
6+
"version": "2025.3.0-eap06",
77
"commands": [
88
"jb"
99
],

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SwaggerComponents/EndpointOrderingFilter.cs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@
66
namespace JsonApiDotNetCore.OpenApi.Swashbuckle.SwaggerComponents;
77

88
[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
9-
internal sealed partial class EndpointOrderingFilter : IDocumentFilter
9+
internal sealed class EndpointOrderingFilter : IDocumentFilter
1010
{
11+
// Workaround for docfx bug.
12+
private const string PatternText = @".*{id}/(?>relationships\/)?(?<RelationshipName>\w+)";
13+
private const RegexOptions RegexOptionsNet60 = RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture;
14+
#pragma warning disable SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
15+
private static readonly Regex RelationshipNameInUrlPattern = new(PatternText, RegexOptionsNet60);
16+
#pragma warning restore SYSLIB1045 // Convert to 'GeneratedRegexAttribute'.
17+
1118
public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
1219
{
1320
ArgumentNullException.ThrowIfNull(swaggerDoc);
@@ -51,11 +58,8 @@ private static bool IsSecondaryEndpoint(KeyValuePair<string, IOpenApiPathItem> e
5158

5259
private static string GetRelationshipName(KeyValuePair<string, IOpenApiPathItem> entry)
5360
{
54-
Match match = RelationshipNameInUrlRegex().Match(entry.Key);
61+
Match match = RelationshipNameInUrlPattern.Match(entry.Key);
5562

5663
return match.Success ? match.Groups["RelationshipName"].Value : string.Empty;
5764
}
58-
59-
[GeneratedRegex(@".*{id}/(?>relationships\/)?(?<RelationshipName>\w+)", RegexOptions.CultureInvariant | RegexOptions.ExplicitCapture)]
60-
private static partial Regex RelationshipNameInUrlRegex();
6165
}

src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
using JsonApiDotNetCore.Resources.Annotations;
77
using JsonApiDotNetCore.Serialization.Objects;
88

9-
// ReSharper disable InvalidXmlDocComment
10-
// Justification: Temporary workaround for Resharper bug at https://youtrack.jetbrains.com/issue/RSRP-501671.
11-
129
namespace JsonApiDotNetCore.Configuration;
1310

1411
/// <summary>

src/JsonApiDotNetCore/Resources/IResourceDefinition.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
using JsonApiDotNetCore.Queries.Expressions;
55
using JsonApiDotNetCore.Resources.Annotations;
66

7-
// ReSharper disable InvalidXmlDocComment
8-
// Justification: Temporary workaround for Resharper bug at https://youtrack.jetbrains.com/issue/RSRP-501671.
9-
107
namespace JsonApiDotNetCore.Resources;
118

129
/// <summary>

test/OpenApiTests/ModelStateValidation/ModelStateValidationTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ namespace OpenApiTests.ModelStateValidation;
77

88
public sealed class ModelStateValidationTests : IClassFixture<OpenApiTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext>>
99
{
10-
// ReSharper disable once UseCollectionExpression (https://youtrack.jetbrains.com/issue/RSRP-497450)
11-
public static readonly TheoryData<string> SchemaNames = new()
12-
{
10+
public static readonly TheoryData<string> SchemaNames =
11+
[
1312
"attributesInCreateSocialMediaAccountRequest",
1413
"attributesInUpdateSocialMediaAccountRequest",
1514
"attributesInSocialMediaAccountResponse"
16-
};
15+
];
1716

1817
private readonly OpenApiTestContext<OpenApiStartup<ModelStateValidationDbContext>, ModelStateValidationDbContext> _testContext;
1918

0 commit comments

Comments
 (0)