chore: merge main into current branch

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -438,7 +438,10 @@ private static async Task<ReadResult> ParseOpenApiAsync(string openApiFile, bool
             var sb = new StringBuilder();
             document.SerializeAsV3(new OpenApiYamlWriter(new StringWriter(sb)));
 
-            var doc = OpenApiDocument.Parse(sb.ToString(), format).Document;
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+
+            var doc = OpenApiDocument.Parse(sb.ToString(), format, settings).Document;
 
             return doc;
         }

src/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-#nullable enable
-
 // This collection of attribute definitions are helpers for accessing trim-related attributes in
 // projects targeting .NET 6 or lower. Since the trimmer queries for these attributes by name, having
 // these attributes source included is sufficient for the trimmer to recognize them. For more information

src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs

@@ -14,7 +14,6 @@ namespace Microsoft.OpenApi.Extensions
     /// </summary>
     public static class OpenApiTypeMapper
     {
-#nullable enable
         /// <summary>
         /// Maps a JsonSchema data type to an identifier.
         /// </summary>
@@ -75,8 +74,6 @@ internal static string ToSingleIdentifier(this JsonSchemaType schemaType)
             return schemaType.ToIdentifiersInternal().Single();
         }
 
-#nullable restore
-
         /// <summary>
         /// Converts a schema type's identifier into the enum equivalent
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiComponents.cs

@@ -9,8 +9,6 @@
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Writers;
 
-#nullable enable
-
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>

src/Microsoft.OpenApi/Models/OpenApiDiscriminator.cs

@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Writers;
 
 namespace Microsoft.OpenApi.Models
@@ -20,7 +21,7 @@ public class OpenApiDiscriminator : IOpenApiSerializable, IOpenApiExtensible
         /// <summary>
         /// An object to hold mappings between payload values and schema names or references.
         /// </summary>
-        public IDictionary<string, string>? Mapping { get; set; } = new Dictionary<string, string>();
+        public IDictionary<string, OpenApiSchemaReference>? Mapping { get; set; } = new Dictionary<string, OpenApiSchemaReference>();
 
         /// <summary>
         /// This object MAY be extended with Specification Extensions.
@@ -38,7 +39,7 @@ public OpenApiDiscriminator() { }
         public OpenApiDiscriminator(OpenApiDiscriminator discriminator)
         {
             PropertyName = discriminator?.PropertyName ?? PropertyName;
-            Mapping = discriminator?.Mapping != null ? new Dictionary<string, string>(discriminator.Mapping) : null;
+            Mapping = discriminator?.Mapping != null ? new Dictionary<string, OpenApiSchemaReference>(discriminator.Mapping) : null;
             Extensions = discriminator?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(discriminator.Extensions) : null;
         }
 
@@ -80,7 +81,13 @@ private void SerializeInternal(IOpenApiWriter writer)
             writer.WriteProperty(OpenApiConstants.PropertyName, PropertyName);
 
             // mapping
-            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) => w.WriteValue(s));
+            writer.WriteOptionalMap(OpenApiConstants.Mapping, Mapping, (w, s) =>
+            {
+                if (!string.IsNullOrEmpty(s.Reference.ReferenceV3) && s.Reference.ReferenceV3 is not null)
+                {
+                    w.WriteValue(s.Reference.ReferenceV3);
+                }
+            });
         }
 
         /// <summary>

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -17,8 +17,6 @@
 using Microsoft.OpenApi.Services;
 using Microsoft.OpenApi.Writers;
 
-#nullable enable
-
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>

src/Microsoft.OpenApi/Models/OpenApiMediaType.cs

@@ -10,8 +10,6 @@
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Writers;
 
-#nullable enable
-
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>

src/Microsoft.OpenApi/Models/OpenApiOperation.cs

@@ -9,8 +9,6 @@
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Writers;
 
-#nullable enable
-
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>

src/Microsoft.OpenApi/Models/OpenApiReference.cs

@@ -281,10 +281,8 @@ internal void EnsureHostDocumentIsSet(OpenApiDocument currentDocument)
             Utils.CheckArgumentNull(currentDocument);
             hostDocument ??= currentDocument;
         }
-        #nullable enable
         private static string? GetPropertyValueFromNode(JsonObject jsonObject, string key) =>
         jsonObject.TryGetPropertyValue(key, out var valueNode) && valueNode is JsonValue valueCast && valueCast.TryGetValue<string>(out var strValue) ? strValue : null;
-        #nullable restore
         internal void SetSummaryAndDescriptionFromMapNode(MapNode mapNode)
         {
             var (description, summary) = mapNode.JsonNode switch {

src/Microsoft.OpenApi/OpenApiTagComparer.cs

@@ -4,7 +4,6 @@
 
 namespace Microsoft.OpenApi;
 
-#nullable enable
 /// <summary>
 /// This comparer is used to maintain a globally unique list of tags encountered
 /// in a particular OpenAPI document.
@@ -44,4 +43,3 @@ public bool Equals(IOpenApiTag? x, IOpenApiTag? y)
     /// <inheritdoc/>
     public int GetHashCode(IOpenApiTag obj) => string.IsNullOrEmpty(obj?.Name) ? 0 : StringComparer.GetHashCode(obj!.Name);
 }
-#nullable restore