Update Microsoft.OpenApi to 3.0.0

eng/Versions.props

@@ -188,8 +188,8 @@
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
     <XUnitRunnerVisualStudioVersion>3.1.3</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
-    <MicrosoftOpenApiVersion>2.0.0</MicrosoftOpenApiVersion>
-    <MicrosoftOpenApiYamlReaderVersion>2.0.0</MicrosoftOpenApiYamlReaderVersion>
+    <MicrosoftOpenApiVersion>3.0.0</MicrosoftOpenApiVersion>
+    <MicrosoftOpenApiYamlReaderVersion>3.0.0</MicrosoftOpenApiYamlReaderVersion>
     <!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
     <DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
     <DotnetServeVersion>1.10.93</DotnetServeVersion>

src/OpenApi/gen/XmlCommentGenerator.Emitter.cs

@@ -415,7 +415,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -476,7 +479,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/src/Services/OpenApiDocumentService.cs

@@ -412,7 +412,7 @@ private async Task<OpenApiResponse> GetResponseAsync(
         var response = new OpenApiResponse
         {
             Description = apiResponseType.Description ?? ReasonPhrases.GetReasonPhrase(statusCode),
-            Content = new Dictionary<string, OpenApiMediaType>()
+            Content = new Dictionary<string, IOpenApiMediaType>()
         };
 
         // ApiResponseFormats aggregates information about the supported response content types
@@ -570,7 +570,7 @@ private async Task<OpenApiRequestBody> GetFormRequestBody(
             // serializing a form collection from an empty body. Instead, requiredness
             // must be set on a per-parameter basis. See below.
             Required = true,
-            Content = new Dictionary<string, OpenApiMediaType>()
+            Content = new Dictionary<string, IOpenApiMediaType>()
         };
 
         var schema = new OpenApiSchema { Type = JsonSchemaType.Object, Properties = new Dictionary<string, IOpenApiSchema>() };
@@ -744,7 +744,7 @@ private async Task<OpenApiRequestBody> GetJsonRequestBody(
         var requestBody = new OpenApiRequestBody
         {
             Required = IsRequired(bodyParameter),
-            Content = new Dictionary<string, OpenApiMediaType>(),
+            Content = new Dictionary<string, IOpenApiMediaType>(),
             Description = GetParameterDescriptionFromAttribute(bodyParameter)
         };
 

src/OpenApi/src/Services/OpenApiGenerator.cs

@@ -197,7 +197,7 @@ private static OpenApiResponses GetOpenApiResponses(MethodInfo method, EndpointM
 
             // TODO: Use the discarded response Type for schema generation
             var (_, contentTypes) = annotation.Value;
-            var responseContent = new Dictionary<string, OpenApiMediaType>();
+            var responseContent = new Dictionary<string, IOpenApiMediaType>();
 
             foreach (var contentType in contentTypes)
             {
@@ -269,7 +269,7 @@ private static void GenerateDefaultResponses(Dictionary<int, (Type?, MediaTypeCo
         }
 
         var acceptsMetadata = metadata.GetMetadata<IAcceptsMetadata>();
-        var requestBodyContent = new Dictionary<string, OpenApiMediaType>();
+        var requestBodyContent = new Dictionary<string, IOpenApiMediaType>();
 
         if (acceptsMetadata is not null)
         {

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AddOpenApiTests.CanInterceptAddOpenApi#OpenApiXmlCommentSupport.generated.verified.cs

@@ -397,7 +397,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -458,7 +461,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/AdditionalTextsTests.CanHandleXmlForSchemasInAdditionalTexts#OpenApiXmlCommentSupport.generated.verified.cs

@@ -426,7 +426,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -487,7 +490,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/CompletenessTests.SupportsAllXmlTagsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs

@@ -524,7 +524,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -585,7 +588,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromControllers#OpenApiXmlCommentSupport.generated.verified.cs

@@ -401,7 +401,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -462,7 +465,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/OperationTests.SupportsXmlCommentsOnOperationsFromMinimalApis#OpenApiXmlCommentSupport.generated.verified.cs

@@ -445,7 +445,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -506,7 +509,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.SupportsXmlCommentsOnSchemas#OpenApiXmlCommentSupport.generated.verified.cs

@@ -427,7 +427,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -488,7 +491,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/SchemaTests.XmlCommentsOnPropertiesShouldApplyToSchemaReferences#OpenApiXmlCommentSupport.generated.verified.cs

@@ -406,7 +406,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -467,7 +470,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.SourceGenerators.Tests/snapshots/XmlCommentDocumentationIdTests.CanMergeXmlCommentsWithDifferentDocumentationIdFormats#OpenApiXmlCommentSupport.generated.verified.cs

@@ -398,7 +398,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     }
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = jsonString.Parse();
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = jsonString.Parse();
+                                        }
                                     }
                                 }
                             }
@@ -459,7 +462,10 @@ public Task TransformAsync(OpenApiOperation operation, OpenApiOperationTransform
                                     var parsedExample = jsonString.Parse();
                                     foreach (var mediaType in content)
                                     {
-                                        mediaType.Example = parsedExample;
+                                        if (mediaType is OpenApiMediaType concrete)
+                                        {
+                                            concrete.Example = parsedExample;
+                                        }
                                     }
                                 }
                             }

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

@@ -100,7 +100,7 @@ public async Task MapOpenApi_ReturnsDefaultDocumentIfNoNameProvided(string expec
         Assert.Equal(expectedContentType, context.Response.ContentType);
         var responseString = Encoding.UTF8.GetString(responseBodyStream.ToArray());
         // String check to validate that generated document starts with YAML syntax
-        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
+        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.2'", StringComparison.OrdinalIgnoreCase));
         responseBodyStream.Position = 0;
         await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {
@@ -221,7 +221,7 @@ public async Task MapOpenApi_ReturnsDocumentIfNameProvidedInQuery(string expecte
         Assert.Equal(expectedContentType, context.Response.ContentType);
         var responseString = Encoding.UTF8.GetString(responseBodyStream.ToArray());
         // String check to validate that generated document starts with YAML syntax
-        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.1'", StringComparison.OrdinalIgnoreCase));
+        Assert.Equal(isYaml, responseString.StartsWith("openapi: '3.1.2'", StringComparison.OrdinalIgnoreCase));
         responseBodyStream.Position = 0;
         await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
         {

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/OpenApiDocumentIntegrationTests.cs

@@ -16,6 +16,7 @@ public static TheoryData<string, OpenApiSpecVersion> OpenApiDocuments()
         [
             OpenApiSpecVersion.OpenApi3_0,
             OpenApiSpecVersion.OpenApi3_1,
+            OpenApiSpecVersion.OpenApi3_2,
         ];
 
         var testCases = new TheoryData<string, OpenApiSpecVersion>();

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

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | controllers",
     "version": "1.0.0"

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

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | forms",
     "version": "1.0.0"

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

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | responses",
     "version": "1.0.0"

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

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | schemas-by-ref",
     "version": "1.0.0"

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v1.verified.txt

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | v1",
     "version": "1.0.0"

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=v2.verified.txt

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | v2",
     "contact": {

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Integration/snapshots/OpenApi3_1/OpenApiDocumentIntegrationTests.VerifyOpenApiDocument_documentName=xml.verified.txt

@@ -1,5 +1,5 @@
 {
-  "openapi": "3.1.1",
+  "openapi": "3.1.2",
   "info": {
     "title": "Sample | xml",
     "version": "1.0.0"