Skip to content

Commit b2c5885

Browse files
captainsafiacaptainsafia
committed
Update to 2.0.0-preview.6
1 parent 76122ef commit b2c5885

10 files changed

+145
-65
lines changed

‎eng/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,8 +335,8 @@
335335
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
336336
<XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
337337
<MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
338-
<MicrosoftOpenApiVersion>2.0.0-preview2</MicrosoftOpenApiVersion>
339-
<MicrosoftOpenApiReadersVersion>2.0.0-preview2</MicrosoftOpenApiReadersVersion>
338+
<MicrosoftOpenApiVersion>2.0.0-preview4</MicrosoftOpenApiVersion>
339+
<MicrosoftOpenApiReadersVersion>2.0.0-preview4</MicrosoftOpenApiReadersVersion>
340340
<!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
341341
<DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
342342
<DotnetServeVersion>1.10.93</DotnetServeVersion>

‎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.ToString()!)}");
32+
var url = new Uri(baseUri, $"/api/docs/schemas/{Uri.EscapeDataString(schema.Type.ToString()!.ToLowerInvariant())}");
3333

3434
schema.ExternalDocs = new OpenApiExternalDocs
3535
{

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Extensions/OpenApiEndpointRouteBuilderExtensionsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,8 @@ private static async Task ValidateOpenApiDocumentAsync(MemoryStream documentStre
200200
documentStream.Position = 0;
201201
OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
202202
var result = await OpenApiDocument.LoadAsync(documentStream, format);
203-
Assert.Empty(result.OpenApiDiagnostic.Errors);
204-
action(result.OpenApiDocument);
203+
Assert.Empty(result.Diagnostic.Errors);
204+
action(result.Document);
205205
}
206206

207207
private static IServiceProvider CreateServiceProvider(string documentName = Microsoft.AspNetCore.OpenApi.OpenApiConstants.DefaultDocumentName)

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=controllers.verified.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"/getbyidandname/{id}/{name}": {
99
"get": {
1010
"tags": [
11-
"Test"
11+
{
12+
"name": "Test"
13+
}
1214
],
1315
"parameters": [
1416
{
@@ -57,7 +59,9 @@
5759
"/forms": {
5860
"post": {
5961
"tags": [
60-
"Test"
62+
{
63+
"name": "Test"
64+
}
6165
],
6266
"requestBody": {
6367
"content": {
@@ -89,6 +93,8 @@
8993
}
9094
},
9195
"tags": [
92-
"Test"
96+
{
97+
"name": "Test"
98+
}
9399
]
94100
}

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=forms.verified.txt‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"/forms/form-file": {
99
"post": {
1010
"tags": [
11-
"Sample"
11+
{
12+
"name": "Sample"
13+
}
1214
],
1315
"requestBody": {
1416
"content": {
@@ -38,7 +40,9 @@
3840
"/forms/form-files": {
3941
"post": {
4042
"tags": [
41-
"Sample"
43+
{
44+
"name": "Sample"
45+
}
4246
],
4347
"requestBody": {
4448
"content": {
@@ -68,7 +72,9 @@
6872
"/forms/form-file-multiple": {
6973
"post": {
7074
"tags": [
71-
"Sample"
75+
{
76+
"name": "Sample"
77+
}
7278
],
7379
"requestBody": {
7480
"content": {
@@ -112,7 +118,9 @@
112118
"/forms/form-todo": {
113119
"post": {
114120
"tags": [
115-
"Sample"
121+
{
122+
"name": "Sample"
123+
}
116124
],
117125
"requestBody": {
118126
"content": {
@@ -139,7 +147,9 @@
139147
"/forms/forms-pocos-and-files": {
140148
"post": {
141149
"tags": [
142-
"Sample"
150+
{
151+
"name": "Sample"
152+
}
143153
],
144154
"requestBody": {
145155
"content": {
@@ -215,6 +225,8 @@
215225
}
216226
},
217227
"tags": [
218-
"Sample"
228+
{
229+
"name": "Sample"
230+
}
219231
]
220232
}

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=responses.verified.txt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"/responses/200-add-xml": {
99
"get": {
1010
"tags": [
11-
"Sample"
11+
{
12+
"name": "Sample"
13+
}
1214
],
1315
"responses": {
1416
"200": {
@@ -32,7 +34,9 @@
3234
"/responses/200-only-xml": {
3335
"get": {
3436
"tags": [
35-
"Sample"
37+
{
38+
"name": "Sample"
39+
}
3640
],
3741
"responses": {
3842
"200": {
@@ -51,7 +55,9 @@
5155
"/responses/triangle": {
5256
"get": {
5357
"tags": [
54-
"Sample"
58+
{
59+
"name": "Sample"
60+
}
5561
],
5662
"responses": {
5763
"200": {
@@ -70,7 +76,9 @@
7076
"/responses/shape": {
7177
"get": {
7278
"tags": [
73-
"Sample"
79+
{
80+
"name": "Sample"
81+
}
7482
],
7583
"responses": {
7684
"200": {
@@ -196,6 +204,8 @@
196204
}
197205
},
198206
"tags": [
199-
"Sample"
207+
{
208+
"name": "Sample"
209+
}
200210
]
201211
}

‎src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=schemas-by-ref.verified.txt‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
"/schemas-by-ref/typed-results": {
99
"get": {
1010
"tags": [
11-
"Sample"
11+
{
12+
"name": "Sample"
13+
}
1214
],
1315
"responses": {
1416
"200": {
@@ -27,7 +29,9 @@
2729
"/schemas-by-ref/multiple-results": {
2830
"get": {
2931
"tags": [
30-
"Sample"
32+
{
33+
"name": "Sample"
34+
}
3135
],
3236
"responses": {
3337
"200": {
@@ -56,7 +60,9 @@
5660
"/schemas-by-ref/iresult-no-produces": {
5761
"get": {
5862
"tags": [
59-
"Sample"
63+
{
64+
"name": "Sample"
65+
}
6066
],
6167
"responses": {
6268
"200": {
@@ -68,7 +74,9 @@
6874
"/schemas-by-ref/iresult-with-produces": {
6975
"get": {
7076
"tags": [
71-
"Sample"
77+
{
78+
"name": "Sample"
79+
}
7280
],
7381
"responses": {
7482
"200": {
@@ -87,7 +95,9 @@
8795
"/schemas-by-ref/primitives": {
8896
"get": {
8997
"tags": [
90-
"Sample"
98+
{
99+
"name": "Sample"
100+
}
91101
],
92102
"parameters": [
93103
{
@@ -121,7 +131,9 @@
121131
"/schemas-by-ref/product": {
122132
"get": {
123133
"tags": [
124-
"Sample"
134+
{
135+
"name": "Sample"
136+
}
125137
],
126138
"requestBody": {
127139
"content": {
@@ -150,7 +162,9 @@
150162
"/schemas-by-ref/account": {
151163
"get": {
152164
"tags": [
153-
"Sample"
165+
{
166+
"name": "Sample"
167+
}
154168
],
155169
"requestBody": {
156170
"content": {
@@ -179,7 +193,9 @@
179193
"/schemas-by-ref/array-of-ints": {
180194
"post": {
181195
"tags": [
182-
"Sample"
196+
{
197+
"name": "Sample"
198+
}
183199
],
184200
"requestBody": {
185201
"content": {
@@ -213,7 +229,9 @@
213229
"/schemas-by-ref/list-of-ints": {
214230
"post": {
215231
"tags": [
216-
"Sample"
232+
{
233+
"name": "Sample"
234+
}
217235
],
218236
"requestBody": {
219237
"content": {
@@ -247,7 +265,9 @@
247265
"/schemas-by-ref/ienumerable-of-ints": {
248266
"post": {
249267
"tags": [
250-
"Sample"
268+
{
269+
"name": "Sample"
270+
}
251271
],
252272
"responses": {
253273
"200": {
@@ -267,7 +287,9 @@
267287
"/schemas-by-ref/dictionary-of-ints": {
268288
"get": {
269289
"tags": [
270-
"Sample"
290+
{
291+
"name": "Sample"
292+
}
271293
],
272294
"responses": {
273295
"200": {
@@ -290,7 +312,9 @@
290312
"/schemas-by-ref/frozen-dictionary-of-ints": {
291313
"get": {
292314
"tags": [
293-
"Sample"
315+
{
316+
"name": "Sample"
317+
}
294318
],
295319
"responses": {
296320
"200": {
@@ -313,7 +337,9 @@
313337
"/schemas-by-ref/shape": {
314338
"post": {
315339
"tags": [
316-
"Sample"
340+
{
341+
"name": "Sample"
342+
}
317343
],
318344
"requestBody": {
319345
"content": {
@@ -335,7 +361,9 @@
335361
"/schemas-by-ref/weatherforecastbase": {
336362
"post": {
337363
"tags": [
338-
"Sample"
364+
{
365+
"name": "Sample"
366+
}
339367
],
340368
"requestBody": {
341369
"content": {
@@ -357,7 +385,9 @@
357385
"/schemas-by-ref/person": {
358386
"post": {
359387
"tags": [
360-
"Sample"
388+
{
389+
"name": "Sample"
390+
}
361391
],
362392
"requestBody": {
363393
"content": {
@@ -617,6 +647,8 @@
617647
}
618648
},
619649
"tags": [
620-
"Sample"
650+
{
651+
"name": "Sample"
652+
}
621653
]
622654
}

0 commit comments

Comments
 (0)