Skip to content

Commit 6c9e049

Browse files
committed
Update frozen Swashbuckle dependency to latest version and remove patched SchemaGenerator
1 parent cdca6e0 commit 6c9e049

16 files changed

+15
-539
lines changed

docs/usage/openapi.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ app.UseSwagger(options => options.RouteTemplate = "api-docs/{documentName}/swagg
5252
Instead, always call `UseSwagger()` *without parameters*. To change the route template, use the code below:
5353

5454
```c#
55-
builder.Services.Configure<SwaggerOptions>(options => options.RouteTemplate = "api-docs/{documentName}/swagger.yaml");
55+
builder.Services.Configure<SwaggerOptions>(options => options.RouteTemplate = "/api-docs/{documentName}/swagger.yaml");
5656
```
5757

5858
If you want to inject dependencies to set the route template, use:
@@ -62,7 +62,7 @@ builder.Services.AddOptions<SwaggerOptions>().Configure<IServiceProvider>((optio
6262
{
6363
var webHostEnvironment = serviceProvider.GetRequiredService<IWebHostEnvironment>();
6464
string appName = webHostEnvironment.ApplicationName;
65-
options.RouteTemplate = $"api-docs/{{documentName}}/{appName}-swagger.yaml";
65+
options.RouteTemplate = $"/api-docs/{{documentName}}/{appName}-swagger.yaml";
6666
});
6767
```
6868

package-versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<CodeAnalysisFrozenVersion>4.1.0</CodeAnalysisFrozenVersion>
55
<DemystifierFrozenVersion>0.4.1</DemystifierFrozenVersion>
66
<HumanizerFrozenVersion>2.14.1</HumanizerFrozenVersion>
7-
<SwashbuckleFrozenVersion>6.5.0</SwashbuckleFrozenVersion>
7+
<SwashbuckleFrozenVersion>6.6.1</SwashbuckleFrozenVersion>
88
<NewtonsoftJsonFrozenVersion>13.0.3</NewtonsoftJsonFrozenVersion>
99

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

src/JsonApiDotNetCore.OpenApi/OpenApiDescriptionLinkProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public OpenApiDescriptionLinkProvider(IOptionsMonitor<SwaggerGeneratorOptions> s
3333
string latestVersionDocumentName = swaggerGeneratorOptions.SwaggerDocs.Last().Key;
3434

3535
SwaggerOptions swaggerOptions = _swaggerOptionsMonitor.CurrentValue;
36-
return swaggerOptions.RouteTemplate.Replace("{documentName}", latestVersionDocumentName).Replace("{json|yaml}", "json");
36+
return swaggerOptions.RouteTemplate.Replace("{documentName}", latestVersionDocumentName).Replace("{extension:regex(^(json|ya?ml)$)}", "json");
3737
}
3838

3939
return null;

0 commit comments

Comments
 (0)