Skip to content

Bump Swashbuckle.AspNetCore from 10.0.1 to 10.1.0 #1884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dependabot merged 2 commits into from
Dec 15, 2025
Merged

Bump Swashbuckle.AspNetCore from 10.0.1 to 10.1.0 #1884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9db82b2
Bump Swashbuckle.AspNetCore from 10.0.2-preview.2077 to 10.1.0
dependabot[bot] Dec 15, 2025
6c53baf
Remove reflection-based workaround
bkoelman Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package-versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
<NewtonsoftJsonFrozenVersion>13.0.4</NewtonsoftJsonFrozenVersion>
<SwashbuckleFrozenVersion>10.0.1</SwashbuckleFrozenVersion>
<SwashbuckleFrozenVersion>10.1.0</SwashbuckleFrozenVersion>
<SystemTextRegularExpressionsFrozenVersion>4.3.1</SystemTextRegularExpressionsFrozenVersion>

<!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
Expand Down
43 changes: 0 additions & 43 deletions src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,11 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using Microsoft.OpenApi;
using Swashbuckle.AspNetCore.SwaggerGen;

namespace JsonApiDotNetCore.OpenApi.Swashbuckle;

internal static class SchemaRepositoryExtensions
{
private const string ReservedIdsFieldName = "_reservedIds";
private static readonly FieldInfo ReservedIdsField = GetReservedIdsField();

private static FieldInfo GetReservedIdsField()
{
FieldInfo? field = typeof(SchemaRepository).GetField(ReservedIdsFieldName, BindingFlags.Instance | BindingFlags.NonPublic);

if (field == null)
{
throw new InvalidOperationException($"Failed to locate private field '{ReservedIdsFieldName}' " +
$"in type '{typeof(SchemaRepository).FullName}' in assembly '{typeof(SchemaRepository).Assembly.FullName}'.");
}

if (field.FieldType != typeof(Dictionary<Type, string>))
{
throw new InvalidOperationException($"Unexpected type '{field.FieldType}' of private field '{ReservedIdsFieldName}' " +
$"in type '{typeof(SchemaRepository).FullName}' in assembly '{typeof(SchemaRepository).Assembly.FullName}'.");
}

return field;
}

public static OpenApiSchemaReference LookupByType(this SchemaRepository schemaRepository, Type schemaType)
{
ArgumentNullException.ThrowIfNull(schemaRepository);
Expand All @@ -48,24 +25,4 @@ public static bool TryLookupByTypeSafe(this SchemaRepository schemaRepository, T
referenceSchema = result ? obliviousReferenceSchema : null;
return result;
}

public static void ReplaceSchemaId(this SchemaRepository schemaRepository, Type oldSchemaType, string newSchemaId)
{
ArgumentNullException.ThrowIfNull(schemaRepository);
ArgumentNullException.ThrowIfNull(oldSchemaType);
ArgumentException.ThrowIfNullOrEmpty(newSchemaId);

if (schemaRepository.TryLookupByTypeSafe(oldSchemaType, out OpenApiSchemaReference? referenceSchema))
{
string oldSchemaId = referenceSchema.GetReferenceId();

IOpenApiSchema targetSchema = schemaRepository.Schemas[oldSchemaId];

schemaRepository.Schemas.Remove(oldSchemaId);
schemaRepository.Schemas.Add(newSchemaId, targetSchema);

var reservedIds = (Dictionary<Type, string>)ReservedIdsField.GetValue(schemaRepository)!;
reservedIds.Remove(oldSchemaType);
}
}
}