Merge pull request #666 from microsoft/feat/upgrade-oai

feat: bump openapi.net packages to the latest preview.

Author: andrueastman

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

@@ -135,15 +135,15 @@ public IEnumerable<ODataPath> AllPaths
         /// <summary>
         /// Gets all tags.
         /// </summary>
-        public IList<OpenApiTag> Tags { get; private set; }
+        public ISet<OpenApiTag> Tags { get; private set; }
 
         /// <summary>
         /// Append tag.
         /// </summary>
         /// <param name="tagItem">The tag item.</param>
         internal void AppendTag(OpenApiTag tagItem)
         {
-            Tags ??= [];
+            Tags ??= new HashSet<OpenApiTag>();
 
             if (FindTagByName(tagItem.Name) is not null)
             {

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

@@ -38,7 +38,7 @@ public static OpenApiDocument CreateDocument(this ODataContext context)
 
                 Servers = context.CreateServers(),
 
-                SecurityRequirements = null,
+                Security = null,
 
                 ExternalDocs = null,
             };

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

@@ -5,6 +5,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -58,9 +59,9 @@ public static void AddPathItemsToDocument(this ODataContext context, OpenApiDocu
             {
                 OpenApiPathItem rootPath = new()
                 {
-                    Operations = new Dictionary<OperationType, OpenApiOperation> {
+                    Operations = new Dictionary<HttpMethod, OpenApiOperation> {
                         {
-                            OperationType.Get, new OpenApiOperation {
+                            HttpMethod.Get, new OpenApiOperation {
                                 OperationId = "graphService.GetGraphService",
                                 Responses = new OpenApiResponses()
                                 {

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

@@ -22,7 +22,7 @@ internal static class OpenApiTagGenerator
         /// </summary>
         /// <param name="context">The OData context.</param>
         /// <returns>The created collection of <see cref="OpenApiTag"/> object.</returns>
-        public static IList<OpenApiTag> CreateTags(this ODataContext context)
+        public static ISet<OpenApiTag> CreateTags(this ODataContext context)
         {
             Utils.CheckArgumentNull(context, nameof(context));
 
@@ -38,7 +38,7 @@ public static IList<OpenApiTag> CreateTags(this ODataContext context)
                 return context.Tags;
             }
 
-            IList<OpenApiTag> tags = new List<OpenApiTag>();
+            var tags = new HashSet<OpenApiTag>();
             if (context.EntityContainer != null)
             {
                 foreach (IEdmEntityContainerElement element in context.Model.EntityContainer.Elements)

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

@@ -29,7 +29,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-preview9" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.14" />
 	<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

@@ -9,6 +9,7 @@
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.OData.Operation;
 
@@ -35,7 +36,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
     protected override void SetTags(OpenApiOperation operation)
     {
         string tagName = EdmModelHelper.GenerateComplexPropertyPathTagName(Path, Context);
-
+        operation.Tags ??= new HashSet<OpenApiTagReference>();
         if (!string.IsNullOrEmpty(tagName))
         {
             Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()

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

@@ -4,6 +4,7 @@
 // ------------------------------------------------------------
 
 using System.Linq;
+using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
@@ -28,7 +29,7 @@ public ComplexPropertyGetOperationHandler(OpenApiDocument document):base(documen
 
     }
     /// <inheritdoc />
-    public override OperationType OperationType => OperationType.Get;
+    public override HttpMethod OperationType => HttpMethod.Get;
 
     private ReadRestrictionsType _readRestrictions;
 

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.OData.Operation;
@@ -18,5 +19,5 @@ public ComplexPropertyPatchOperationHandler(OpenApiDocument document):base(docum
 
     }
     /// <inheritdoc />
-    public override OperationType OperationType => OperationType.Patch;
+    public override HttpMethod OperationType => HttpMethod.Patch;
 }

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

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -41,7 +42,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
         _insertRestrictions ??= complexPropertyInsertRestrictions;
     }
     /// <inheritdoc />
-    public override OperationType OperationType => OperationType.Post;
+    public override HttpMethod OperationType => HttpMethod.Post;
 
     private InsertRestrictionsType _insertRestrictions;
 

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.OData.Operation;
@@ -18,5 +19,5 @@ public ComplexPropertyPutOperationHandler(OpenApiDocument document) : base(docum
 
     }
     /// <inheritdoc />
-    public override OperationType OperationType => OperationType.Put;
+    public override HttpMethod OperationType => HttpMethod.Put;
 }

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

@@ -5,6 +5,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -50,7 +51,7 @@ protected override void SetBasicInfo(OpenApiOperation operation)
         // OperationId
         if (Context.Settings.EnableOperationId)
         {
-            string prefix = OperationType == OperationType.Patch ? "Update" : "Set";
+            string prefix = OperationType == HttpMethod.Patch ? "Update" : "Set";
             operation.OperationId = EdmModelHelper.GenerateComplexPropertyPathOperationId(Path, Context, prefix);
         }
     }

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

@@ -6,6 +6,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OData.Edm.Vocabularies;
 using Microsoft.OpenApi.Any;
@@ -33,7 +34,7 @@ public DollarCountGetOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Get;
+        public override HttpMethod OperationType => HttpMethod.Get;
 
         /// <summary>
         /// Gets/sets the segment before $count.
@@ -84,6 +85,8 @@ private void AddODataSegmentToAnnotables(ODataSegment oDataSegment, ODataSegment
         protected override void SetTags(OpenApiOperation operation)
         {
             string tagName = null;
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
+
             if (SecondLastSegment is ODataNavigationSourceSegment sourceSegment)
             {
                 tagName = TagNameFromNavigationSourceSegment(sourceSegment);

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -25,7 +26,7 @@ public EdmActionImportOperationHandler(OpenApiDocument document):base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Post;
+        public override HttpMethod OperationType => HttpMethod.Post;
 
         protected override void SetRequestBody(OpenApiOperation operation)
         {

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -28,7 +29,7 @@ public EdmActionOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Post;
+        public override HttpMethod OperationType => HttpMethod.Post;
 
         /// <inheritdoc/>
         protected override void SetBasicInfo(OpenApiOperation operation)

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -25,7 +26,7 @@ public EdmFunctionImportOperationHandler(OpenApiDocument document) : base(docume
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Get;
+        public override HttpMethod OperationType => HttpMethod.Get;
 
         /// <inheritdoc/>
         protected override void SetParameters(OpenApiOperation operation)

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
@@ -26,7 +27,7 @@ public EdmFunctionOperationHandler(OpenApiDocument document):base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Get;
+        public override HttpMethod OperationType => HttpMethod.Get;
 
         /// <summary>
         /// Gets the Edm Function.

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

@@ -141,6 +141,8 @@ protected override void SetTags(OpenApiOperation operation)
             var tag = CreateTag(EdmOperationImport);
             tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
             Context.AppendTag(tag);
+
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
             base.SetTags(operation);

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

@@ -154,6 +154,7 @@ protected override void SetTags(OpenApiOperation operation)
                 Name = tagName,
             };
             tag.Extensions.Add(Constants.xMsTocType, new OpenApiAny("container"));
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tag.Name, _document));
 
             Context.AppendTag(tag);

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

@@ -4,6 +4,7 @@
 // ------------------------------------------------------------
 
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.OData.Common;
@@ -29,7 +30,7 @@ public EntityDeleteOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Delete;
+        public override HttpMethod OperationType => HttpMethod.Delete;
 
         private DeleteRestrictionsType _deleteRestrictions;
 

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

@@ -13,6 +13,7 @@
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Models.Interfaces;
+using System.Net.Http;
 
 namespace Microsoft.OpenApi.OData.Operation
 {
@@ -32,7 +33,7 @@ public EntityGetOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Get;
+        public override HttpMethod OperationType => HttpMethod.Get;
 
         private ReadRestrictionsType _readRestrictions;
 

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.OData.Operation
@@ -23,6 +24,6 @@ public EntityPatchOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Patch;
+        public override HttpMethod OperationType => HttpMethod.Patch;
     }
 }

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

@@ -3,6 +3,7 @@
 //  Licensed under the MIT License (MIT). See LICENSE in the repo root for license information.
 // ------------------------------------------------------------
 
+using System.Net.Http;
 using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.OData.Operation
@@ -23,6 +24,6 @@ public EntityPutOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Put;
+        public override HttpMethod OperationType => HttpMethod.Put;
     }
 }

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

@@ -4,6 +4,7 @@
 // ------------------------------------------------------------
 
 using System.Linq;
+using System.Net.Http;
 using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Any;
@@ -33,7 +34,7 @@ public EntitySetGetOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Get;
+        public override HttpMethod OperationType => HttpMethod.Get;
 
         private ReadRestrictionsType _readRestrictions;
 

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

@@ -10,6 +10,7 @@
 using Microsoft.OpenApi.OData.Common;
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Vocabulary.Core;
+using System.Collections.Generic;
 
 namespace Microsoft.OpenApi.OData.Operation
 {
@@ -46,7 +47,7 @@ protected override void Initialize(ODataContext context, ODataPath path)
         protected override void SetTags(OpenApiOperation operation)
         {
             var tagName = EntitySet.Name + "." + EntitySet.EntityType.Name;
-
+            operation.Tags ??= new HashSet<OpenApiTagReference>();
             operation.Tags.Add(new OpenApiTagReference(tagName, _document));
 
             Context.AddExtensionToTag(tagName, Constants.xMsTocType, new OpenApiAny("page"), () => new OpenApiTag()

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

@@ -5,6 +5,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.Http;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.Interfaces;
@@ -33,7 +34,7 @@ public EntitySetPostOperationHandler(OpenApiDocument document) : base(document)
 
         }
         /// <inheritdoc/>
-        public override OperationType OperationType => OperationType.Post;
+        public override HttpMethod OperationType => HttpMethod.Post;
 
         private InsertRestrictionsType _insertRestrictions;