chore: merge branch with main

Author: MaggieKimani1

.github/CODEOWNERS

@@ -1 +1 @@
-* @irvinesunday @darrelmiller @gavinbarron @millicentachieng @MaggieKimani1 @andrueastman @baywet
+* @microsoft/openapi-write

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.0.0-preview.15"
+  ".": "2.0.0-preview.16"
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.0.0-preview.16](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.15...v2.0.0-preview.16) (2025-03-20)
+
+
+### Bug Fixes
+
+* always serialize security schemes in components ([3aac661](https://github.com/microsoft/OpenAPI.NET/commit/3aac661ca2e8050136c423f2835fcdd3a9096482))
+* always serialize security schemes in components ([a765acf](https://github.com/microsoft/OpenAPI.NET/commit/a765acf380135694bbd4d1336bd4beddef6ef808))
+
 ## [2.0.0-preview.15](https://github.com/microsoft/OpenAPI.NET/compare/v2.0.0-preview.14...v2.0.0-preview.15) (2025-03-18)
 
 

Directory.Build.props

@@ -12,7 +12,7 @@
     <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>OpenAPI .NET</PackageTags>
-    <Version>2.0.0-preview.15</Version>
+    <Version>2.0.0-preview.16</Version>
   </PropertyGroup>
   <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
   <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -38,7 +38,7 @@
     </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.10" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.12" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="2.0.0-preview3" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
   </ItemGroup>

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -438,7 +438,10 @@ private static async Task<ReadResult> ParseOpenApiAsync(string openApiFile, bool
             var sb = new StringBuilder();
             document.SerializeAsV3(new OpenApiYamlWriter(new StringWriter(sb)));
 
-            var doc = OpenApiDocument.Parse(sb.ToString(), format).Document;
+            var settings = new OpenApiReaderSettings();
+            settings.AddYamlReader();
+
+            var doc = OpenApiDocument.Parse(sb.ToString(), format, settings).Document;
 
             return doc;
         }

src/Microsoft.OpenApi.Workbench/Microsoft.OpenApi.Workbench.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
@@ -9,7 +9,7 @@
     <NoWarn>NU1903</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.61">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

src/Microsoft.OpenApi/Attributes/TrimmingAttributes.cs

@@ -1,8 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license.
 
-#nullable enable
-
 // This collection of attribute definitions are helpers for accessing trim-related attributes in
 // projects targeting .NET 6 or lower. Since the trimmer queries for these attributes by name, having
 // these attributes source included is sufficient for the trimmer to recognize them. For more information

src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs

@@ -14,7 +14,6 @@ namespace Microsoft.OpenApi.Extensions
     /// </summary>
     public static class OpenApiTypeMapper
     {
-#nullable enable
         /// <summary>
         /// Maps a JsonSchema data type to an identifier.
         /// </summary>
@@ -75,8 +74,6 @@ internal static string ToSingleIdentifier(this JsonSchemaType schemaType)
             return schemaType.ToIdentifiersInternal().Single();
         }
 
-#nullable restore
-
         /// <summary>
         /// Converts a schema type's identifier into the enum equivalent
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiComponents.cs

@@ -3,13 +3,12 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models.Interfaces;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Writers;
 
-#nullable enable
-
 namespace Microsoft.OpenApi.Models
 {
     /// <summary>
@@ -110,7 +109,7 @@ public void SerializeAsV31(IOpenApiWriter writer)
             // however if they have cycles, then we will need a component rendered
             if (writer.GetSettings().InlineLocalReferences)
             {
-                RenderComponents(writer, (writer, element) => element.SerializeAsV31(writer));
+                RenderComponents(writer, (writer, element) => element.SerializeAsV31(writer), OpenApiSpecVersion.OpenApi3_1);                
                 return;
             }
 
@@ -148,7 +147,7 @@ public void SerializeAsV3(IOpenApiWriter writer)
             // however if they have cycles, then we will need a component rendered
             if (writer.GetSettings().InlineLocalReferences)
             {
-                RenderComponents(writer, (writer, element) => element.SerializeAsV3(writer));
+                RenderComponents(writer, (writer, element) => element.SerializeAsV3(writer), OpenApiSpecVersion.OpenApi3_0);
                 return;
             }
 
@@ -315,14 +314,27 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
             writer.WriteEndObject();
         }
 
-        private void RenderComponents(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback)
+        private void RenderComponents(IOpenApiWriter writer, Action<IOpenApiWriter, IOpenApiSerializable> callback, OpenApiSpecVersion version)
         {
             var loops = writer.GetSettings().LoopDetector.Loops;
             writer.WriteStartObject();
             if (loops.TryGetValue(typeof(OpenApiSchema), out var schemas))
             {
                 writer.WriteOptionalMap(OpenApiConstants.Schemas, Schemas, callback);
             }
+            // always render security schemes as inlining of security requirement objects is not allowed in the spec
+            if (SecuritySchemes is not null && SecuritySchemes.Any())
+            {
+                writer.WriteOptionalMap(
+                OpenApiConstants.SecuritySchemes,
+                SecuritySchemes,
+                (w, key, component) =>
+                {
+                    if (version is OpenApiSpecVersion.OpenApi3_1)
+                        component.SerializeAsV31(writer);
+                    component.SerializeAsV3(writer);
+                });
+            }
             writer.WriteEndObject();
         }