Update to Microsoft.OpenApi v2.0.0-preview.11 (#60761)

* Update to Microsoft.OpenApi v2.0.0-preview.11

* Special case Identity APIs for XML

* Revert "Special case Identity APIs for XML"

This reverts commit 048240f.

* Update method return types

Author: captainsafia

eng/Versions.props

@@ -335,8 +335,8 @@
     <XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
     <XUnitRunnerVisualStudioVersion>2.8.2</XUnitRunnerVisualStudioVersion>
     <MicrosoftDataSqlClientVersion>5.2.2</MicrosoftDataSqlClientVersion>
-    <MicrosoftOpenApiVersion>2.0.0-preview7</MicrosoftOpenApiVersion>
-    <MicrosoftOpenApiReadersVersion>2.0.0-preview7</MicrosoftOpenApiReadersVersion>
+    <MicrosoftOpenApiVersion>2.0.0-preview.11</MicrosoftOpenApiVersion>
+    <MicrosoftOpenApiReadersVersion>2.0.0-preview.11</MicrosoftOpenApiReadersVersion>
     <!-- dotnet tool versions (see also auto-updated DotnetEfVersion property). -->
     <DotnetDumpVersion>6.0.322601</DotnetDumpVersion>
     <DotnetServeVersion>1.10.93</DotnetServeVersion>

src/OpenApi/src/Comparers/OpenApiTagComparer.cs

@@ -75,7 +75,6 @@ public async Task<OpenApiDocument> GetOpenApiDocumentAsync(IServiceProvider scop
             Servers = GetOpenApiServers(httpRequest)
         };
         document.Paths = await GetOpenApiPathsAsync(document, scopedServiceProvider, operationTransformers, schemaTransformers, cancellationToken);
-        document.Tags = document.Tags?.Distinct(OpenApiTagComparer.Instance).ToList();
         try
         {
             await ApplyTransformersAsync(document, scopedServiceProvider, cancellationToken);
@@ -327,15 +326,15 @@ private async Task<OpenApiOperation> GetOperationAsync(
         => description.ActionDescriptor.AttributeRouteInfo?.Name ??
             description.ActionDescriptor.EndpointMetadata.OfType<IEndpointNameMetadata>().LastOrDefault()?.EndpointName;
 
-    private static List<OpenApiTagReference> GetTags(ApiDescription description, OpenApiDocument document)
+    private static HashSet<OpenApiTagReference> GetTags(ApiDescription description, OpenApiDocument document)
     {
         var actionDescriptor = description.ActionDescriptor;
         if (actionDescriptor.EndpointMetadata?.OfType<ITagsMetadata>().LastOrDefault() is { } tagsMetadata)
         {
-            List<OpenApiTagReference> tags = [];
+            HashSet<OpenApiTagReference> tags = [];
             foreach (var tag in tagsMetadata.Tags)
             {
-                document.Tags ??= [];
+                document.Tags ??= new HashSet<OpenApiTag>();
                 document.Tags.Add(new OpenApiTag { Name = tag });
                 tags.Add(new OpenApiTagReference(tag, document));
 
@@ -345,9 +344,9 @@ private static List<OpenApiTagReference> GetTags(ApiDescription description, Ope
         // If no tags are specified, use the controller name as the tag. This effectively
         // allows us to group endpoints by the "resource" concept (e.g. users, todos, etc.)
         var controllerName = description.ActionDescriptor.RouteValues["controller"];
-        document.Tags ??= [];
+        document.Tags ??= new HashSet<OpenApiTag>();
         document.Tags.Add(new OpenApiTag { Name = controllerName });
-        return [new OpenApiTagReference(controllerName, document)];
+        return [new(controllerName, document)];
     }
 
     private async Task<OpenApiResponses> GetResponsesAsync(

src/OpenApi/src/Services/OpenApiDocumentService.cs

@@ -324,20 +324,20 @@ private static void GenerateDefaultResponses(Dictionary<int, (Type?, MediaTypeCo
         return null;
     }
 
-    private List<OpenApiTagReference> GetOperationTags(MethodInfo methodInfo, EndpointMetadataCollection metadata)
+    private HashSet<OpenApiTagReference> GetOperationTags(MethodInfo methodInfo, EndpointMetadataCollection metadata)
     {
         var metadataList = metadata.GetOrderedMetadata<ITagsMetadata>();
         var document = new OpenApiDocument();
 
         if (metadataList.Count > 0)
         {
-            var tags = new List<OpenApiTagReference>();
+            var tags = new HashSet<OpenApiTagReference>();
 
             foreach (var metadataItem in metadataList)
             {
                 foreach (var tag in metadataItem.Tags)
                 {
-                    document.Tags ??= [];
+                    document.Tags ??= new HashSet<OpenApiTag>();
                     document.Tags.Add(new OpenApiTag { Name = tag });
                     tags.Add(new OpenApiTagReference(tag, document));
                 }
@@ -359,7 +359,7 @@ private List<OpenApiTagReference> GetOperationTags(MethodInfo methodInfo, Endpoi
             controllerName = _environment?.ApplicationName ?? string.Empty;
         }
 
-        document.Tags ??= [];
+        document.Tags ??= new HashSet<OpenApiTag>();
         document.Tags.Add(new OpenApiTag { Name = controllerName });
         return [new(controllerName, document)];
     }

src/OpenApi/src/Services/OpenApiGenerator.cs

@@ -235,8 +235,9 @@ await ValidateOpenApiDocumentAsync(responseBodyStream, document =>
     private static async Task ValidateOpenApiDocumentAsync(MemoryStream documentStream, Action<OpenApiDocument> action, string format = "json")
     {
         documentStream.Position = 0;
-        OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
-        var result = await OpenApiDocument.LoadAsync(documentStream, format);
+        var readerSettings = new OpenApiReaderSettings();
+        readerSettings.AddYamlReader();
+        var result = await OpenApiDocument.LoadAsync(documentStream, format, readerSettings);
         Assert.Empty(result.Diagnostic.Errors);
         action(result.Document);
     }

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

@@ -11,10 +11,6 @@
 [UsesVerify]
 public sealed class OpenApiDocumentIntegrationTests(SampleAppFixture fixture) : IClassFixture<SampleAppFixture>
 {
-    private static Regex DateTimeRegex() => new(
-        @"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{7}[+-]\d{2}:\d{2}",
-        RegexOptions.Compiled);
-
     [Theory]
     [InlineData("v1", OpenApiSpecVersion.OpenApi3_0)]
     [InlineData("v2", OpenApiSpecVersion.OpenApi3_0)]
@@ -42,7 +38,6 @@ public async Task VerifyOpenApiDocument(string documentName, OpenApiSpecVersion
         var outputDirectory = Path.Combine(baseSnapshotsDirectory, version.ToString());
         await Verifier.Verify(json)
             .UseDirectory(outputDirectory)
-            .ScrubLinesWithReplace(line => DateTimeRegex().Replace(line, "[datetime]"))
             .UseParameters(documentName);
     }
 }

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

@@ -375,12 +375,12 @@
           "dateTimeType": {
             "type": "string",
             "format": "date-time",
-            "example": "[datetime]"
+            "example": "2022-01-01T00:00:00Z"
           },
           "dateOnlyType": {
             "type": "string",
             "format": "date",
-            "example": "[datetime]"
+            "example": "2022-01-01"
           }
         }
       }

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

@@ -375,12 +375,12 @@
           "dateTimeType": {
             "type": "string",
             "format": "date-time",
-            "example": "[datetime]"
+            "example": "2022-01-01T00:00:00Z"
           },
           "dateOnlyType": {
             "type": "string",
             "format": "date",
-            "example": "[datetime]"
+            "example": "2022-01-01"
           }
         }
       }