Add root property jsonSchemaDialect

src/Microsoft.OpenApi.Readers/ParsingContext.cs

@@ -69,7 +69,7 @@ internal OpenApiDocument Parse(YamlDocument yamlDocument)
                 case string version when version.is3_0() || version.is3_1():
                     VersionService = new OpenApiV3VersionService(Diagnostic);
                     doc = VersionService.LoadDocument(RootNode);
-                    this.Diagnostic.SpecificationVersion = OpenApiSpecVersion.OpenApi3_0;
+                    this.Diagnostic.SpecificationVersion = version.is3_1() ? OpenApiSpecVersion.OpenApi3_1 : OpenApiSpecVersion.OpenApi3_0;
                     ValidateRequiredFields(doc, version);
                     break;
 

src/Microsoft.OpenApi.Readers/V3/OpenApiDocumentDeserializer.cs

@@ -21,6 +21,7 @@ internal static partial class OpenApiV3Deserializer
                 } /* Version is valid field but we already parsed it */
             },
             {"info", (o, n) => o.Info = LoadInfo(n)},
+            {"jsonSchemaDialect", (o, n) => o.JsonSchemaDialect = n.GetScalarValue() },
             {"servers", (o, n) => o.Servers = n.CreateList(LoadServer)},
             {"paths", (o, n) => o.Paths = LoadPaths(n)},
             {"webhooks", (o, n) => o.Webhooks = LoadPaths(n)},

src/Microsoft.OpenApi/Extensions/OpenApiSerializableExtensions.cs

@@ -15,6 +15,8 @@ namespace Microsoft.OpenApi.Extensions
     /// </summary>
     public static class OpenApiSerializableExtensions
     {
+        public delegate void SerializeDelegate(IOpenApiWriter writer, IOpenApiSerializable element);
+
         /// <summary>
         /// Serialize the <see cref="IOpenApiSerializable"/> to the Open API document (JSON) using the given stream and specification version.
         /// </summary>
@@ -117,6 +119,10 @@ public static void Serialize<T>(this T element, IOpenApiWriter writer, OpenApiSp
 
             switch (specVersion)
             {
+                case OpenApiSpecVersion.OpenApi3_1:
+                    element.SerializeAsV31(writer);
+                    break;
+
                 case OpenApiSpecVersion.OpenApi3_0:
                     element.SerializeAsV3(writer);
                     break;

src/Microsoft.OpenApi/Interfaces/IOpenApiReferenceable.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
+using static Microsoft.OpenApi.Extensions.OpenApiSerializableExtensions;
 
 namespace Microsoft.OpenApi.Interfaces
 {
@@ -25,7 +26,7 @@ public interface IOpenApiReferenceable : IOpenApiSerializable
         /// <summary>
         /// Serialize to OpenAPI V3 document without using reference.
         /// </summary>
-        void SerializeAsV3WithoutReference(IOpenApiWriter writer);
+        void SerializeAsV3WithoutReference(IOpenApiWriter writer, OpenApiSpecVersion version, SerializeDelegate callback);
 
         /// <summary>
         /// Serialize to OpenAPI V2 document without using reference.

src/Microsoft.OpenApi/Interfaces/IOpenApiSerializable.cs

@@ -10,6 +10,12 @@ namespace Microsoft.OpenApi.Interfaces
     /// </summary>
     public interface IOpenApiSerializable : IOpenApiElement
     {
+        /// <summary>
+        /// Serialize OpenAPI element into v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        void SerializeAsV31(IOpenApiWriter writer);
+
         /// <summary>
         /// Serialize Open API element to v3.0.
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiCallback.cs

@@ -2,10 +2,10 @@
 // Licensed under the MIT license. 
 
 using System.Collections.Generic;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Expressions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
+using static Microsoft.OpenApi.Extensions.OpenApiSerializableExtensions;
 
 namespace Microsoft.OpenApi.Models
 {
@@ -75,32 +75,50 @@ public void AddPathItem(RuntimeExpression expression, OpenApiPathItem pathItem)
 
             PathItems.Add(expression, pathItem);
         }
-
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.1
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <exception cref="System.NotImplementedException"></exception>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV3(writer));
+        }
+
         /// <summary>
         /// Serialize <see cref="OpenApiCallback"/> to Open Api v3.0
         /// </summary>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiCallback"/>
+        /// </summary>
+        /// <param name="writer"></param>
+        /// <param name="version"></param>
+        /// <param name="callback"></param>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, SerializeDelegate callback)
+        {
+            writer = writer ?? throw Error.ArgumentNull(nameof(writer));
 
             var target = this;
 
             if (Reference != null)
             {
                 if (!writer.GetSettings().ShouldInlineReference(Reference))
                 {
-                    Reference.SerializeAsV3(writer);
+                    callback(writer, Reference);
                     return;
                 }
                 else
                 {
                     target = GetEffective(Reference.HostDocument);
                 }
             }
-            target.SerializeAsV3WithoutReference(writer);
+            target.SerializeAsV3WithoutReference(writer, version, callback);
         }
 
         /// <summary>
@@ -125,18 +143,18 @@ public OpenApiCallback GetEffective(OpenApiDocument doc)
         /// Serialize to OpenAPI V3 document without using reference.
         /// </summary>
 
-        public void SerializeAsV3WithoutReference(IOpenApiWriter writer)
+        public void SerializeAsV3WithoutReference(IOpenApiWriter writer, OpenApiSpecVersion version, SerializeDelegate callback)
         {
             writer.WriteStartObject();
 
             // path items
             foreach (var item in PathItems)
             {
-                writer.WriteRequiredObject(item.Key.Expression, item.Value, (w, p) => p.SerializeAsV3(w));
+                writer.WriteRequiredObject(item.Key.Expression, item.Value, (w, p) => callback(w, p));
             }
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }

src/Microsoft.OpenApi/Models/OpenApiComponents.cs

@@ -1,10 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Writers;
+using static Microsoft.OpenApi.Extensions.OpenApiSerializableExtensions;
 
 namespace Microsoft.OpenApi.Models
 {
@@ -95,14 +97,50 @@ public OpenApiComponents(OpenApiComponents components)
         }
 
         /// <summary>
-        /// Serialize <see cref="OpenApiComponents"/> to Open Api v3.0.
+        /// Serialize <see cref="OpenApiComponents"/> to Open API v3.1.
         /// </summary>
+        /// <param name="writer"></param>
+        public void SerializeAsV31(IOpenApiWriter writer)
+        {            
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_1, (writer, element) => element.SerializeAsV3(writer));
+
+            // pathItems - only present in v3.1
+            writer.WriteOptionalMap(
+            OpenApiConstants.PathItems,
+            PathItems,
+            (w, key, component) =>
+            {
+                if (component.Reference != null &&
+                    component.Reference.Type == ReferenceType.Schema &&
+                    component.Reference.Id == key)
+                {
+                    component.SerializeAsV3WithoutReference(w, OpenApiSpecVersion.OpenApi3_1, callback: (w, e) => e.SerializeAsV3(w));
+                }
+                else
+                {
+                    component.SerializeAsV3(w);
+                }
+            });
+
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/> to v3.0
+        /// </summary>
+        /// <param name="writer"></param>
         public void SerializeAsV3(IOpenApiWriter writer)
         {
-            if (writer == null)
-            {
-                throw Error.ArgumentNull(nameof(writer));
-            }
+            SerializeInternal(writer, OpenApiSpecVersion.OpenApi3_0, (writer, element) => element.SerializeAsV3(writer));
+            writer.WriteEndObject();
+        }
+
+        /// <summary>
+        /// Serialize <see cref="OpenApiComponents"/>.
+        /// </summary>
+        private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version, SerializeDelegate callback)
+        {
+            writer = writer ?? throw Error.ArgumentNull(nameof(writer));
 
             // If references have been inlined we don't need the to render the components section
             // however if they have cycles, then we will need a component rendered
@@ -119,7 +157,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
                        OpenApiConstants.Schemas,
                        Schemas,
                        (w, key, component) => {
-                           component.SerializeAsV3WithoutReference(w);
+                           component.SerializeAsV3WithoutReference(w, version, callback);
                            });
                 }
                 writer.WriteEndObject();
@@ -141,11 +179,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Schema &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -159,11 +197,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Response &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -177,11 +215,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Parameter &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -195,11 +233,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Example &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -213,11 +251,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.RequestBody &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -231,11 +269,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Header &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -249,11 +287,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.SecurityScheme &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -267,11 +305,11 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Link &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
@@ -285,36 +323,16 @@ public void SerializeAsV3(IOpenApiWriter writer)
                         component.Reference.Type == ReferenceType.Callback &&
                         component.Reference.Id == key)
                     {
-                        component.SerializeAsV3WithoutReference(w);
+                        component.SerializeAsV3WithoutReference(w, version, callback);
                     }
                     else
                     {
-                        component.SerializeAsV3(w);
-                    }
-                });
-
-            // pathItems
-            writer.WriteOptionalMap(
-                OpenApiConstants.PathItems,
-                PathItems,
-                (w, key, component) =>
-                {
-                    if (component.Reference != null &&
-                        component.Reference.Type == ReferenceType.Schema &&
-                        component.Reference.Id == key)
-                    {
-                        component.SerializeAsV3WithoutReference(w);
-                    }
-                    else
-                    {
-                        component.SerializeAsV3(w);
+                        callback(w, component);
                     }
                 });
 
             // extensions
-            writer.WriteExtensions(Extensions, OpenApiSpecVersion.OpenApi3_0);
-
-            writer.WriteEndObject();
+            writer.WriteExtensions(Extensions, version);
         }
 
         /// <summary>