feat: upgrades OpenApi.Net to preview18

src/Microsoft.OpenApi.OData.Reader/Common/Utils.cs

@@ -9,7 +9,7 @@
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -159,7 +159,7 @@ internal static void AddCustomAttributesToExtensions(this IDictionary<string, IO
             {
                 foreach (var item in attributesValueMap)
                 {
-                    extensions.TryAdd(item.Key, new OpenApiAny(item.Value));
+                    extensions.TryAdd(item.Key, new JsonNodeExtension(item.Value));
                 }
             }
         }

src/Microsoft.OpenApi.OData.Reader/Edm/ODataContext.cs

@@ -8,7 +8,7 @@
 using System.Linq;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -172,7 +172,7 @@ internal void AppendTag(OpenApiTag tagItem)
         /// <param name="extensionName">The extension name.</param>
         /// <param name="extensionValue">The extension value to set.</param>
         /// <param name="initialValueFactory">The tag default value factory.</param>
-        internal void AddExtensionToTag(string tagName, string extensionName, OpenApiAny extensionValue, Func<OpenApiTag> initialValueFactory)
+        internal void AddExtensionToTag(string tagName, string extensionName, JsonNodeExtension extensionValue, Func<OpenApiTag> initialValueFactory)
         {
             Utils.CheckArgumentNullOrEmpty(tagName, nameof(tagName));
             Utils.CheckArgumentNullOrEmpty(extensionName, nameof(extensionName));

src/Microsoft.OpenApi.OData.Reader/EdmModelOpenApiExtensions.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Validation;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -48,7 +48,7 @@ public static OpenApiDocument ConvertToOpenApi(this IEdmModel model, OpenApiConv
 				document.Extensions ??= new Dictionary<string, IOpenApiExtension>();
 				foreach (var error in errors)
 				{
-					document.Extensions.Add(Constants.xMsEdmModelError + index++, new OpenApiAny(error.ToString()));
+					document.Extensions.Add(Constants.xMsEdmModelError + index++, new JsonNodeExtension(error.ToString()));
 				}
 
 				return document;

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiInfoGenerator.cs

@@ -9,7 +9,7 @@
 using System.Reflection;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -48,7 +48,7 @@
 
             // The value of title is the value of the unqualified annotation Core.Description
             // of the main schema or the entity container of the OData service.
             // TODO: https://github.com/Microsoft/OpenAPI.NET.OData/issues/2
 
             //  or the entity container
             if (context.Model.EntityContainer != null)
@@ -74,7 +74,7 @@
 
             // The value of version is the value of the annotation Core.SchemaVersion of the main schema.
             // If no Core.SchemaVersion is present, a default version has to be provided as this is a required OpenAPI field.
             // TODO: https://github.com/Microsoft/OpenAPI.NET.OData/issues/2
 
             return context.Settings.SemVerVersion;
         }
@@ -84,7 +84,7 @@
             Debug.Assert(context != null);
 
             // The value of description is the value of the annotation Core.LongDescription of the main schema.
             // TODO: https://github.com/Microsoft/OpenAPI.NET.OData/issues/2
 
             //  or the entity container
             if (context.EntityContainer != null)
@@ -110,7 +110,7 @@
                 {
                     {
                         "x-ms-generated-by",
-                        new OpenApiAny(new JsonObject
+                        new JsonNodeExtension(new JsonObject
                         {
                             { "toolName", "Microsoft.OpenApi.OData" },
                             { "toolVersion", Assembly.GetExecutingAssembly().GetName().Version?.ToString() }

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiParameterGenerator.cs

@@ -14,10 +14,10 @@
 using System.Diagnostics;
 using System;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Interfaces;
+using Microsoft.OpenApi.Extensions;
 
 namespace Microsoft.OpenApi.OData.Generator
 {
@@ -195,7 +195,7 @@ public static IList<OpenApiParameter> CreateKeyParameters(this ODataContext cont
                 };
 
                 parameter.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                parameter.Extensions.Add(Constants.xMsKeyType, new OpenApiAny(entityType.Name));
+                parameter.Extensions.Add(Constants.xMsKeyType, new JsonNodeExtension(entityType.Name));
                 parameters.Add(parameter);
             }
             else
@@ -221,7 +221,7 @@ public static IList<OpenApiParameter> CreateKeyParameters(this ODataContext cont
                     }
 
                     parameter.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                    parameter.Extensions.Add(Constants.xMsKeyType, new OpenApiAny(entityType.Name));
+                    parameter.Extensions.Add(Constants.xMsKeyType, new JsonNodeExtension(entityType.Name));
                     parameters.Add(parameter);
                 }
             }

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs

@@ -17,7 +17,6 @@
 using Microsoft.OpenApi.MicrosoftExtensions;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models.References;
 using System.Globalization;
@@ -452,7 +451,7 @@
                     // we always want a new copy because it's a reference
                     openApiSchema.Extensions = propertySchema.Extensions is null ? [] : new Dictionary<string, IOpenApiExtension>(propertySchema.Extensions);
                     openApiSchema.Extensions.AddCustomAttributesToExtensions(context, property);
-                    openApiSchema.Extensions.Add(Constants.xMsNavigationProperty, new OpenApiAny(true));
+                    openApiSchema.Extensions.Add(Constants.xMsNavigationProperty, new JsonNodeExtension(true));
                 }
                 properties.Add(property.Name, propertySchema);
             }
@@ -514,7 +513,7 @@
                 {
                     extension = new Dictionary<string, IOpenApiExtension>
                     {
-                        { Constants.xMsDiscriminatorValue, new OpenApiAny("#" + structuredType.FullTypeName()) }
+                        { Constants.xMsDiscriminatorValue, new JsonNodeExtension("#" + structuredType.FullTypeName()) }
                     };
                 }
 
@@ -753,7 +752,7 @@
                 // The type 'System.Double' is not supported in Open API document.
                 case EdmPrimitiveTypeKind.Double:
                     /*
                     {
                         double result;
                         if (Double.TryParse(property.DefaultValueString, out result))
                         {

src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj

@@ -30,7 +30,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.17" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.18" />
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyBaseOperationHandler.cs

@@ -3,7 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -41,7 +41,7 @@ protected override void SetTags(OpenApiOperation operation)
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             if (!string.IsNullOrEmpty(tagName))
             {
-                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
                 {
                     Name = tagName
                 });

src/Microsoft.OpenApi.OData.Reader/Operation/ComplexPropertyGetOperationHandler.cs

@@ -8,7 +8,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -165,7 +165,7 @@ ComplexPropertySegment is not null &&
                 { "operationName", Context.Settings.PageableOperationName}
             };
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+            operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
 
             base.SetExtensions(operation);
         }

src/Microsoft.OpenApi.OData.Reader/Operation/DollarCountGetOperationHandler.cs

@@ -9,7 +9,7 @@
 using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -113,7 +113,7 @@ protected override void SetTags(OpenApiOperation operation)
 
             if (tagName != null && Context is not null)
             {
-                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+                Context.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
                 {
                     Name = tagName
                 });

src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionImportOperationHandler.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -44,7 +44,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("actionImport"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("actionImport"));
 
             base.SetExtensions(operation);
         }

src/Microsoft.OpenApi.OData.Reader/Operation/EdmActionOperationHandler.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -76,7 +76,7 @@ protected override void SetRequestBody(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("action"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("action"));
             base.SetExtensions(operation);
         }
     }

src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionImportOperationHandler.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -65,7 +65,7 @@ protected override void SetParameters(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("functionImport"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("functionImport"));
             base.SetExtensions(operation);
         }
     }

src/Microsoft.OpenApi.OData.Reader/Operation/EdmFunctionOperationHandler.cs

@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -61,7 +61,7 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("function"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("function"));
             base.SetExtensions(operation);
         }
     }

src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationImportOperationHandler.cs

@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -150,7 +150,7 @@ protected override void SetTags(OpenApiOperation operation)
             {
                 var tag = CreateTag(EdmOperationImport);
                 tag.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+                tag.Extensions.Add(Constants.xMsTocType, new JsonNodeExtension("container"));
                 Context?.AppendTag(tag);
 
                 operation.Tags ??= new HashSet<OpenApiTagReference>();

src/Microsoft.OpenApi.OData.Reader/Operation/EdmOperationOperationHandler.cs

@@ -8,7 +8,7 @@
 using System.Linq;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -163,7 +163,7 @@ protected override void SetTags(OpenApiOperation operation)
                 Name = tagName,
             };
             tag.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+            tag.Extensions.Add(Constants.xMsTocType, new JsonNodeExtension("container"));
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
@@ -360,7 +360,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                 };
 
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
             }
             base.SetExtensions(operation);
         }

src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetGetOperationHandler.cs

@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -81,7 +81,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                     { "operationName", Context.Settings.PageableOperationName}
                 };
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
 
                 base.SetExtensions(operation);
             }

src/Microsoft.OpenApi.OData.Reader/Operation/EntitySetOperationHandler.cs

@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -50,7 +50,7 @@ protected override void SetTags(OpenApiOperation operation)
             operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagName, _document));
 
-            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+            Context?.AddExtensionToTag(tagName, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 			{
 				Name = tagName
 			});
@@ -62,7 +62,7 @@ protected override void SetTags(OpenApiOperation operation)
         protected override void SetExtensions(OpenApiOperation operation)
         {
             operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-            operation.Extensions.Add(Constants.xMsDosOperationType, new OpenApiAny("operation"));
+            operation.Extensions.Add(Constants.xMsDosOperationType, new JsonNodeExtension("operation"));
 
             base.SetExtensions(operation);
         }

src/Microsoft.OpenApi.OData.Reader/Operation/MediaEntityOperationalHandler.cs

@@ -4,7 +4,7 @@
 // ------------------------------------------------------------
 
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.OData.Common;
@@ -94,7 +94,7 @@ protected override void SetTags(OpenApiOperation operation)
                 : NavigationSourceSegment?.Identifier + "." + NavigationSourceSegment?.EntityType.Name;
 
 
-            Context?.AddExtensionToTag(tagIdentifier, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()
+            Context?.AddExtensionToTag(tagIdentifier, Constants.xMsTocType, new JsonNodeExtension("page"), () => new OpenApiTag()
 			{
 				Name = tagIdentifier
 			});

src/Microsoft.OpenApi.OData.Reader/Operation/NavigationPropertyGetOperationHandler.cs

@@ -9,7 +9,7 @@
 using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -83,7 +83,7 @@ protected override void SetExtensions(OpenApiOperation operation)
                 };
 
                 operation.Extensions ??= new Dictionary<string, IOpenApiExtension>();
-                operation.Extensions.Add(Constants.xMsPageable, new OpenApiAny(extension));
+                operation.Extensions.Add(Constants.xMsPageable, new JsonNodeExtension(extension));
             }
 
             base.SetExtensions(operation);