Skip to content

Commit 11c390d

Browse files
authored
Upgrade Microsoft.OpenApi dependency to 1.4.3 (#44229)
* Upgrade Microsoft.OpenApi dependency to 1.4.3 * Update tests to use copy constructors
1 parent ed649ac commit 11c390d

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@
290290
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
291291
<MicrosoftDataSqlClientVersion>4.0.1</MicrosoftDataSqlClientVersion>
292292
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
293-
<MicrosoftOpenApiVersion>1.2.3</MicrosoftOpenApiVersion>
293+
<MicrosoftOpenApiVersion>1.4.3</MicrosoftOpenApiVersion>
294294
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
295295
<DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
296296
<DotnetServeVersion>1.10.93</DotnetServeVersion>

src/OpenApi/test/OpenApiRouteHandlerBuilderExtensionTests.cs

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ public void WithOpenApi_CanSetSchemaInOperationWithOverride()
7272
var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
7373
string GetString(string id) => "Foo";
7474
_ = builder.MapDelete("/{id}", GetString)
75-
.WithOpenApi(generatedOperation => {
76-
generatedOperation.Parameters[0].Schema = new() { Type = "number" };
77-
return generatedOperation;
75+
.WithOpenApi(operation => new(operation)
76+
{
77+
Parameters = new List<OpenApiParameter>() { new() { Schema = new() { Type = "number" } } }
7878
});
7979

8080
var dataSource = GetBuilderEndpointDataSource(builder);
@@ -161,15 +161,13 @@ public void WithOpenApi_WorksWithGroupAndSpecificEndpoint()
161161
var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
162162
string GetString() => "Foo";
163163
var myGroup = builder.MapGroup("/group");
164-
myGroup.WithOpenApi(o =>
164+
myGroup.WithOpenApi(o => new(o)
165165
{
166-
o.Summary = "Set from outer group";
167-
return o;
166+
Summary = "Set from outer group"
168167
});
169-
myGroup.MapDelete("/a", GetString).WithOpenApi(o =>
168+
myGroup.MapDelete("/a", GetString).WithOpenApi(o => new(o)
170169
{
171-
o.Summary = "Set from endpoint";
172-
return o;
170+
Summary = "Set from endpoint"
173171
});
174172

175173
// The RotueGroupBuilder adds a single EndpointDataSource.
@@ -195,10 +193,9 @@ public void WithOpenApi_GroupMetadataCanExamineAndExtendMoreLocalMetadata()
195193

196194
static void WithLocalSummary(RouteHandlerBuilder builder)
197195
{
198-
builder.WithOpenApi(operation =>
196+
builder.WithOpenApi(operation => new(operation)
199197
{
200-
operation.Summary = $"| Local Summary | 200 Status Response Content-Type: {operation.Responses["200"].Content.Keys.Single()}";
201-
return operation;
198+
Summary = $"| Local Summary | 200 Status Response Content-Type: {operation.Responses["200"].Content.Keys.Single()}"
202199
});
203200
}
204201

@@ -210,19 +207,17 @@ static void WithLocalSummary(RouteHandlerBuilder builder)
210207
WithLocalSummary(outerGroup.MapDelete("/outer-a", GetString));
211208

212209
// The order WithOpenApi() is relative to the MapDelete() methods does not matter.
213-
outerGroup.WithOpenApi(operation =>
210+
outerGroup.WithOpenApi(operation => new(operation)
214211
{
215-
operation.Summary = $"Outer Group Summary {operation.Summary}";
216-
return operation;
212+
Summary = $"Outer Group Summary {operation.Summary}"
217213
});
218214

219215
WithLocalSummary(outerGroup.MapDelete("/outer-b", GetString));
220216
WithLocalSummary(innerGroup.MapDelete("/inner-a", GetString));
221217

222-
innerGroup.WithOpenApi(operation =>
218+
innerGroup.WithOpenApi(operation => new(operation)
223219
{
224-
operation.Summary = $"| Inner Group Summary {operation.Summary}";
225-
return operation;
220+
Summary = $"| Inner Group Summary {operation.Summary}"
226221
});
227222

228223
WithLocalSummary(innerGroup.MapDelete("/inner-b", GetString));

0 commit comments

Comments
 (0)