Skip to content

Upgrade Microsoft.OpenApi dependency to 1.4.3 #44229

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
merged 2 commits into from
Sep 29, 2022
Merged

Upgrade Microsoft.OpenApi dependency to 1.4.3 #44229

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
379aa85
Upgrade Microsoft.OpenApi dependency to 1.4.3
captainsafia Sep 28, 2022
dfd1ea7
Update tests to use copy constructors
captainsafia Sep 29, 2022
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 eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@
<XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
<MicrosoftDataSqlClientVersion>4.0.1</MicrosoftDataSqlClientVersion>
<MicrosoftAspNetCoreAppVersion>6.0.0-preview.3.21167.1</MicrosoftAspNetCoreAppVersion>
<MicrosoftOpenApiVersion>1.2.3</MicrosoftOpenApiVersion>
<MicrosoftOpenApiVersion>1.4.3</MicrosoftOpenApiVersion>
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
<DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
<DotnetServeVersion>1.10.93</DotnetServeVersion>
Expand Down
31 changes: 13 additions & 18 deletions src/OpenApi/test/OpenApiRouteHandlerBuilderExtensionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ public void WithOpenApi_CanSetSchemaInOperationWithOverride()
var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
string GetString(string id) => "Foo";
_ = builder.MapDelete("/{id}", GetString)
.WithOpenApi(generatedOperation => {
generatedOperation.Parameters[0].Schema = new() { Type = "number" };
return generatedOperation;
.WithOpenApi(operation => new(operation)
{
Parameters = new List<OpenApiParameter>() { new() { Schema = new() { Type = "number" } } }
});

var dataSource = GetBuilderEndpointDataSource(builder);
Expand Down Expand Up @@ -161,15 +161,13 @@ public void WithOpenApi_WorksWithGroupAndSpecificEndpoint()
var builder = new DefaultEndpointRouteBuilder(new ApplicationBuilder(serviceProvider));
string GetString() => "Foo";
var myGroup = builder.MapGroup("/group");
myGroup.WithOpenApi(o =>
myGroup.WithOpenApi(o => new(o)
{
o.Summary = "Set from outer group";
return o;
Summary = "Set from outer group"
});
myGroup.MapDelete("/a", GetString).WithOpenApi(o =>
myGroup.MapDelete("/a", GetString).WithOpenApi(o => new(o)
{
o.Summary = "Set from endpoint";
return o;
Summary = "Set from endpoint"
});

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

static void WithLocalSummary(RouteHandlerBuilder builder)
{
builder.WithOpenApi(operation =>
builder.WithOpenApi(operation => new(operation)
{
operation.Summary = $"| Local Summary | 200 Status Response Content-Type: {operation.Responses["200"].Content.Keys.Single()}";
return operation;
Summary = $"| Local Summary | 200 Status Response Content-Type: {operation.Responses["200"].Content.Keys.Single()}"
});
}

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

// The order WithOpenApi() is relative to the MapDelete() methods does not matter.
outerGroup.WithOpenApi(operation =>
outerGroup.WithOpenApi(operation => new(operation)
{
operation.Summary = $"Outer Group Summary {operation.Summary}";
return operation;
Summary = $"Outer Group Summary {operation.Summary}"
});

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

innerGroup.WithOpenApi(operation =>
innerGroup.WithOpenApi(operation => new(operation)
{
operation.Summary = $"| Inner Group Summary {operation.Summary}";
return operation;
Summary = $"| Inner Group Summary {operation.Summary}"
});

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