Skip to content

Commit 20925c6

Browse files
committed
Upgrade to Microsoft.OpenApi 2.x and support OpenAPI v3.1
1 parent 036ec9e commit 20925c6

File tree

53 files changed

+910
-2628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+910
-2628
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@
328328
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
329329
<XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
330330
<MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
331-
<MicrosoftOpenApiVersion>1.6.17</MicrosoftOpenApiVersion>
332-
<MicrosoftOpenApiReadersVersion>1.6.17</MicrosoftOpenApiReadersVersion>
331+
<MicrosoftOpenApiVersion>2.0.0-preview2</MicrosoftOpenApiVersion>
332+
<MicrosoftOpenApiReadersVersion>2.0.0-preview2</MicrosoftOpenApiReadersVersion>
333333
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
334334
<DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
335335
<DotnetServeVersion>1.10.93</DotnetServeVersion>

src/OpenApi/perf/Microbenchmarks/OpenApiSchemaComparerBenchmark.cs

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,11 @@ public void SchemaTransformer_Setup()
104104
{
105105
if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
106106
{
107-
schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
107+
schema.Extensions["x-my-extension"] = new OpenApiAny(context.ParameterDescription.Name);
108108
}
109109
else
110110
{
111-
schema.Extensions["x-my-extension"] = new OpenApiString("response");
111+
schema.Extensions["x-my-extension"] = new OpenApiAny("response");
112112
}
113113
return Task.CompletedTask;
114114
});
@@ -177,11 +177,11 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
177177
{
178178
if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
179179
{
180-
schema.Extensions["x-my-extension"] = new OpenApiString(context.ParameterDescription.Name);
180+
schema.Extensions["x-my-extension"] = new OpenApiAny(context.ParameterDescription.Name);
181181
}
182182
else
183183
{
184-
schema.Extensions["x-my-extension"] = new OpenApiString("response");
184+
schema.Extensions["x-my-extension"] = new OpenApiAny("response");
185185
}
186186
return Task.CompletedTask;
187187
}

src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext
2929
{
3030
if (Uri.TryCreate(configuration["DocumentationBaseUrl"], UriKind.Absolute, out var baseUri))
3131
{
32-
var url = new Uri(baseUri, $"/api/docs/schemas/{Uri.EscapeDataString(schema.Type)}");
32+
var url = new Uri(baseUri, $"/api/docs/schemas/{Uri.EscapeDataString(schema.Type.ToString()!)}");
3333

3434
schema.ExternalDocs = new OpenApiExternalDocs
3535
{

src/OpenApi/sample/Transformers/OperationTransformers.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using Microsoft.AspNetCore.OpenApi;
5-
using Microsoft.OpenApi.Any;
65
using Microsoft.OpenApi.Extensions;
76
using Microsoft.OpenApi.Models;
87

@@ -15,7 +14,7 @@ public static OpenApiOptions AddHeader(this OpenApiOptions options, string heade
1514
return options.AddOperationTransformer((operation, context, cancellationToken) =>
1615
{
1716
var schema = OpenApiTypeMapper.MapTypeToOpenApiPrimitiveType(typeof(string));
18-
schema.Default = new OpenApiString(defaultValue);
17+
schema.Default = defaultValue;
1918
operation.Parameters ??= [];
2019
operation.Parameters.Add(new OpenApiParameter
2120
{

src/OpenApi/src/Comparers/ComparerHelpers.cs

Lines changed: 0 additions & 95 deletions
This file was deleted.

src/OpenApi/src/Comparers/OpenApiAnyComparer.cs

Lines changed: 0 additions & 117 deletions
This file was deleted.

src/OpenApi/src/Comparers/OpenApiDiscriminatorComparer.cs

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)