Merge branch 'vnext' into issue/288

Author: darrelmiller

.github/dependabot.yml

@@ -0,0 +1,17 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    # default location of `.github/workflows`
+    directory: "/"
+    open-pull-requests-limit: 10
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "nuget"
+    # location of package manifests
+    directory: "/"
+    open-pull-requests-limit: 10
+    schedule:
+      interval: "daily"
+
+# Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

build.cmd

@@ -13,8 +13,11 @@ dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
 dotnet msbuild %PROJ% /t:build /p:Configuration=Release
 dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
-goto :end
-:error
-echo Version parameter missing e.g. build.cmd 1.0.0-beta0008
+Echo Building Microsoft.OpenApi.Tool
+
+SET PROJ=%~dp0src\Microsoft.OpenApi.Tool\Microsoft.OpenApi.Tool.csproj 
+dotnet msbuild %PROJ% /t:restore /p:Configuration=Release
+dotnet msbuild %PROJ% /t:build /p:Configuration=Release
+dotnet msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts
 
 :end

src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj

@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi.Readers</Title>
         <PackageId>Microsoft.OpenApi.Readers</PackageId>
-        <Version>1.2.3</Version>
+        <Version>1.3.0-preview</Version>
         <Description>OpenAPI.NET Readers for JSON and YAML documents</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

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");
 

src/Microsoft.OpenApi.Tool/Microsoft.OpenApi.Tool.csproj

@@ -6,11 +6,11 @@
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>openapi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>0.5.0</Version>
+    <Version>1.3.0-preview</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20104.2" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
   </ItemGroup>
 
   <ItemGroup>

src/Microsoft.OpenApi.Tool/OpenApiService.cs

@@ -18,15 +18,16 @@ public static void ProcessOpenApiDocument(
             FileInfo output,
             OpenApiSpecVersion version,
             OpenApiFormat format,
-            bool inline)
+            bool inline,
+            bool resolveExternal)
         {
             OpenApiDocument document;
             using (Stream stream = input.OpenRead())
             {
 
                 document = new OpenApiStreamReader(new OpenApiReaderSettings
                 {
-                    ReferenceResolution = ReferenceResolutionSetting.ResolveLocalReferences,
+                    ReferenceResolution = resolveExternal == true ? ReferenceResolutionSetting.ResolveAllReferences : ReferenceResolutionSetting.ResolveLocalReferences,
                     RuleSet = ValidationRuleSet.GetDefaultRuleSet()
                 }
                 ).Read(stream, out var context);

src/Microsoft.OpenApi.Tool/Program.cs

@@ -17,10 +17,11 @@ static async Task<int> Main(string[] args)
                 new Option("--output") { Argument = new Argument<FileInfo>() },
                 new Option("--version") { Argument = new Argument<OpenApiSpecVersion>() },
                 new Option("--format") { Argument = new Argument<OpenApiFormat>() },
-                new Option("--inline") { Argument = new Argument<bool>() }
+                new Option("--inline") { Argument = new Argument<bool>() },
+                new Option("--resolveExternal") { Argument = new Argument<bool>() }
             };
 
-            command.Handler = CommandHandler.Create<FileInfo,FileInfo,OpenApiSpecVersion,OpenApiFormat,bool>(
+            command.Handler = CommandHandler.Create<FileInfo,FileInfo,OpenApiSpecVersion,OpenApiFormat,bool, bool>(
                 OpenApiService.ProcessOpenApiDocument);
 
             // Parse the incoming args and invoke the handler

src/Microsoft.OpenApi/Microsoft.OpenApi.csproj

@@ -10,7 +10,7 @@
         <Company>Microsoft</Company>
         <Title>Microsoft.OpenApi</Title>
         <PackageId>Microsoft.OpenApi</PackageId>
-        <Version>1.2.3</Version>
+        <Version>1.3.0-preview</Version>
         <Description>.NET models with JSON and YAML writers for OpenAPI specification</Description>
         <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
         <PackageTags>OpenAPI .NET</PackageTags>

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -631,10 +631,17 @@ internal void WriteAsSchemaProperties(
                 s.SerializeAsV2(w, Required, key));
 
             // additionalProperties
-            writer.WriteOptionalObject(
-                OpenApiConstants.AdditionalProperties,
-                AdditionalProperties,
-                (w, s) => s.SerializeAsV2(w));
+            if (AdditionalPropertiesAllowed)
+            {
+                writer.WriteOptionalObject(
+                    OpenApiConstants.AdditionalProperties,
+                    AdditionalProperties,
+                    (w, s) => s.SerializeAsV2(w));
+            }
+            else
+            {
+                writer.WriteProperty(OpenApiConstants.AdditionalProperties, AdditionalPropertiesAllowed);
+            }
 
             // discriminator
             writer.WriteProperty(OpenApiConstants.Discriminator, Discriminator?.PropertyName);