Merge branch 'vnext' into dm/updatedependencies

Author: darrelmiller

src/Microsoft.OpenApi.Readers/V2/OpenApiExternalDocsDeserializer.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. 
 
 using System;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
 
@@ -31,7 +32,10 @@ internal static partial class OpenApiV2Deserializer
             };
 
         private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
-            new PatternFieldMap<OpenApiExternalDocs>();
+                new PatternFieldMap<OpenApiExternalDocs> {
+
+                    {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
+                    };
 
         public static OpenApiExternalDocs LoadExternalDocs(ParseNode node)
         {

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

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. 
 
 using System;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers.ParseNodes;
 
@@ -31,10 +32,13 @@ internal static partial class OpenApiV3Deserializer
                 },
             };
 
-        private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
-            new PatternFieldMap<OpenApiExternalDocs>();
+    private static readonly PatternFieldMap<OpenApiExternalDocs> _externalDocsPatternFields =
+            new PatternFieldMap<OpenApiExternalDocs> {
 
-        public static OpenApiExternalDocs LoadExternalDocs(ParseNode node)
+                    {s => s.StartsWith("x-"), (o, p, n) => o.AddExtension(p, LoadExtension(p, n))}
+                };
+
+    public static OpenApiExternalDocs LoadExternalDocs(ParseNode node)
         {
             var mapNode = node.CheckMapNode("externalDocs");