Skip to content

Commit ee050bd

Browse files
authored
Update Microsoft.OpenApi to preview28 (#62363)
1 parent ef0da55 commit ee050bd

File tree

74 files changed

+144
-203
lines changed

Some content is hidden

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

74 files changed

+144
-203
lines changed

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,8 @@
323323
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
324324
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
325325
<MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
326-
<MicrosoftOpenApiVersion>2.0.0-preview.18</MicrosoftOpenApiVersion>
327-
<MicrosoftOpenApiYamlReaderVersion>2.0.0-preview.18</MicrosoftOpenApiYamlReaderVersion>
326+
<MicrosoftOpenApiVersion>2.0.0-preview.29</MicrosoftOpenApiVersion>
327+
<MicrosoftOpenApiYamlReaderVersion>2.0.0-preview.29</MicrosoftOpenApiYamlReaderVersion>
328328
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
329329
<DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
330330
<DotnetServeVersion>1.10.93</DotnetServeVersion>

src/OpenApi/gen/XmlCommentGenerator.Emitter.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ namespace Microsoft.AspNetCore.OpenApi.Generated
5858
using Microsoft.AspNetCore.OpenApi;
5959
using Microsoft.AspNetCore.Mvc.Controllers;
6060
using Microsoft.Extensions.DependencyInjection;
61-
using Microsoft.OpenApi.Models;
62-
using Microsoft.OpenApi.Models.Interfaces;
63-
using Microsoft.OpenApi.Models.References;
61+
using Microsoft.OpenApi;
6462
6563
{{GeneratedCodeAttribute}}
6664
file record XmlComment(

src/OpenApi/perf/Microbenchmarks/TransformersBenchmark.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
using Microsoft.AspNetCore.Builder;
66
using Microsoft.AspNetCore.Routing;
77
using Microsoft.Extensions.DependencyInjection;
8-
using Microsoft.OpenApi.Extensions;
9-
using Microsoft.OpenApi.Models;
8+
using Microsoft.OpenApi;
109

1110
namespace Microsoft.AspNetCore.OpenApi.Microbenchmarks;
1211

@@ -102,7 +101,7 @@ public void SchemaTransformer_Setup()
102101
{
103102
_options.AddSchemaTransformer((schema, context, token) =>
104103
{
105-
schema.Extensions ??= [];
104+
schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
106105
if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
107106
{
108107
schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);
@@ -176,7 +175,7 @@ private class SchemaTransformer : IOpenApiSchemaTransformer
176175
{
177176
public Task TransformAsync(OpenApiSchema schema, OpenApiSchemaTransformerContext context, CancellationToken cancellationToken)
178177
{
179-
schema.Extensions ??= [];
178+
schema.Extensions ??= new Dictionary<string, IOpenApiExtension>();
180179
if (context.JsonTypeInfo.Type == typeof(Todo) && context.ParameterDescription != null)
181180
{
182181
schema.Extensions["x-my-extension"] = new JsonNodeExtension(context.ParameterDescription.Name);

src/OpenApi/sample/Program.cs

Lines changed: 0 additions & 1 deletion
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 System.Text.Json.Serialization;
5-
using Microsoft.OpenApi.Models;
65
using Sample.Transformers;
76

87
var builder = WebApplication.CreateBuilder(args);

src/OpenApi/sample/Sample.csproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,8 @@
3939
<ProjectReference Include="../gen/Microsoft.AspNetCore.OpenApi.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
4040
</ItemGroup>
4141

42+
<ItemGroup>
43+
<Using Include="Microsoft.OpenApi" />
44+
</ItemGroup>
45+
4246
</Project>

src/OpenApi/sample/Transformers/AddBearerSecuritySchemeTransformer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
using Microsoft.AspNetCore.Authentication;
55
using Microsoft.AspNetCore.OpenApi;
6-
using Microsoft.OpenApi.Models;
7-
using Microsoft.OpenApi.Models.Interfaces;
86

97
namespace Sample.Transformers;
108

src/OpenApi/sample/Transformers/AddContactTransformer.cs

Lines changed: 0 additions & 1 deletion
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.Models;
65

76
namespace Sample.Transformers;
87

src/OpenApi/sample/Transformers/AddExternalDocsTransformer.cs

Lines changed: 0 additions & 1 deletion
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.Models;
65

76
namespace Sample.Transformers;
87

src/OpenApi/sample/Transformers/OperationTransformers.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +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.Extensions;
6-
using Microsoft.OpenApi.Models;
75

86
namespace Sample.Transformers;
97

src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
using Microsoft.AspNetCore.Mvc.ModelBinding;
1616
using Microsoft.AspNetCore.Routing;
1717
using Microsoft.AspNetCore.Routing.Constraints;
18-
using Microsoft.OpenApi.Models;
1918

2019
namespace Microsoft.AspNetCore.OpenApi;
2120

0 commit comments

Comments
 (0)