Merge pull request #439 from microsoft/dm/OpenApiComparer

Update vnext and temporarily skip failing comparer tests

Author: darrelmiller

README.md

@@ -1,6 +1,12 @@
 ![Category overview screenshot](docs/images/oainet.png "Microsoft + OpenAPI = Love")
 
-# OpenAPI.NET
+# OpenAPI.NET 
+
+|Package|Nuget|
+|--|--|
+|Models and Writers|[![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.svg)](https://www.nuget.org/packages/Microsoft.OpenApi/) |
+|Readers | [![nuget](https://img.shields.io/nuget/v/Microsoft.OpenApi.Readers.svg)](https://www.nuget.org/packages/Microsoft.OpenApi.Readers/) |
+
 
 The **OpenAPI.NET** SDK contains a useful object model for OpenAPI documents in .NET along with common serializers to extract raw OpenAPI JSON and YAML documents from the model.
 

build.cmd

@@ -6,16 +6,16 @@ SET VERSION=%~1
 Echo Building Microsoft.OpenApi
 
 SET PROJ=%~dp0src\Microsoft.OpenApi\Microsoft.OpenApi.csproj 
-msbuild %PROJ% /t:restore /p:Configuration=Release
-msbuild %PROJ% /t:build /p:Configuration=Release
-msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
+dotnet build %PROJ% /t:restore /p:Configuration=Release
+dotnet build %PROJ% /t:build /p:Configuration=Release
+dotnet build %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
 
 Echo Building Microsoft.OpenApi.Readers
 
 SET PROJ=%~dp0src\Microsoft.OpenApi.Readers\Microsoft.OpenApi.Readers.csproj 
-msbuild %PROJ% /t:restore /p:Configuration=Release
-msbuild %PROJ% /t:build /p:Configuration=Release
-msbuild %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
+dotnet build %PROJ% /t:restore /p:Configuration=Release
+dotnet build %PROJ% /t:build /p:Configuration=Release
+dotnet build %PROJ% /t:pack /p:Configuration=Release;PackageOutputPath=%~dp0artifacts;Version=%VERSION%
 
 goto :end
 :error

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.1.1</Version>
+        <Version>1.1.4</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/ParseNodes/AnyFieldMap.cs

@@ -0,0 +1,11 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyFieldMap<T> : Dictionary<string, AnyFieldMapParameter<T>>
+    {
+    }
+}

src/Microsoft.OpenApi.Readers/ParseNodes/AnyFieldMapParameter.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyFieldMapParameter<T>
+    {
+        /// <summary>
+        /// Constructor.
+        /// </summary>
+        public AnyFieldMapParameter(
+            Func<T, IOpenApiAny> propertyGetter,
+            Action<T, IOpenApiAny> propertySetter,
+            Func<T, OpenApiSchema> schemaGetter)
+        {
+            this.PropertyGetter = propertyGetter;
+            this.PropertySetter = propertySetter;
+            this.SchemaGetter = schemaGetter;
+        }
+
+        /// <summary>
+        /// Function to retrieve the value of the property.
+        /// </summary>
+        public Func<T, IOpenApiAny> PropertyGetter { get; }
+
+        /// <summary>
+        /// Function to set the value of the property.
+        /// </summary>
+        public Action<T, IOpenApiAny> PropertySetter { get; }
+
+        /// <summary>
+        /// Function to get the schema to apply to the property.
+        /// </summary>
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
+    }
+}

src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMap.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyListFieldMap<T> : Dictionary<string, AnyListFieldMapParameter<T>>
+    {
+
+    }
+}

src/Microsoft.OpenApi.Readers/ParseNodes/AnyListFieldMapParameter.cs

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyListFieldMapParameter<T>
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public AnyListFieldMapParameter(
+            Func<T, IList<IOpenApiAny>> propertyGetter,
+            Action<T, IList<IOpenApiAny>> propertySetter,
+            Func<T, OpenApiSchema> schemaGetter)
+        {
+            this.PropertyGetter = propertyGetter;
+            this.PropertySetter = propertySetter;
+            this.SchemaGetter = schemaGetter;
+        }
+
+        /// <summary>
+        /// Function to retrieve the value of the property.
+        /// </summary>
+        public Func<T, IList<IOpenApiAny>> PropertyGetter { get; }
+
+        /// <summary>
+        /// Function to set the value of the property.
+        /// </summary>
+        public Action<T, IList<IOpenApiAny>> PropertySetter { get; }
+
+        /// <summary>
+        /// Function to get the schema to apply to the property.
+        /// </summary>
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
+    }
+}

src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMap.cs

@@ -0,0 +1,12 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System.Collections.Generic;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyMapFieldMap<T, U> : Dictionary<string, AnyMapFieldMapParameter<T, U>>
+    {
+
+    }
+}

src/Microsoft.OpenApi.Readers/ParseNodes/AnyMapFieldMapParameter.cs

@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. 
+
+using System;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Models;
+
+namespace Microsoft.OpenApi.Readers.ParseNodes
+{
+    internal class AnyMapFieldMapParameter<T, U>
+    {
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        public AnyMapFieldMapParameter(
+            Func<T, IDictionary<string, U>> propertyMapGetter,
+            Func<U, IOpenApiAny> propertyGetter,
+            Action<U, IOpenApiAny> propertySetter,
+            Func<T, OpenApiSchema> schemaGetter)
+        {
+            this.PropertyMapGetter = propertyMapGetter;
+            this.PropertyGetter = propertyGetter;
+            this.PropertySetter = propertySetter;
+            this.SchemaGetter = schemaGetter;
+        }
+
+        /// <summary>
+        /// Function to retrieve the property that is a map from string to an inner element containing IOpenApiAny.
+        /// </summary>
+        public Func<T, IDictionary<string, U>> PropertyMapGetter { get; }
+
+        /// <summary>
+        /// Function to retrieve the value of the property from an inner element.
+        /// </summary>
+        public Func<U, IOpenApiAny> PropertyGetter { get; }
+
+        /// <summary>
+        /// Function to set the value of the property.
+        /// </summary>
+        public Action<U, IOpenApiAny> PropertySetter { get; }
+
+        /// <summary>
+        /// Function to get the schema to apply to the property.
+        /// </summary>
+        public Func<T, OpenApiSchema> SchemaGetter { get; }
+    }
+}