Merge branch 'feat/oai-3-2-support' into copilot/fix-1e80ce48-c500-4024-9aa8-a50a721fd288

Author: baywet

.azure-pipelines/ci-build.yml

@@ -7,6 +7,7 @@ trigger:
     include:
     - main
     - support/v1
+    - support/v2
   tags:
     include:
     - 'v*'
@@ -15,6 +16,7 @@ pr:
     include:
     - main
     - support/v1
+    - support/v2
 
 variables:
   buildPlatform: 'Any CPU'
@@ -307,6 +309,7 @@ extends:
                   publishFeedCredentials: 'OpenAPI Nuget Connection'
 
       - deployment: create_github_release
+        condition: and(contains(variables['build.SourceBranch'], 'refs/tags/v'), succeeded())
         templateContext:
           type: releaseJob
           isProduction: true

.github/policies/OpenAPI.NET-branch-protection.yml

@@ -81,3 +81,39 @@ configuration:
       # Restrict who can dismiss pull request reviews. boolean
       restrictsReviewDismissals: false
 
+    - branchNamePattern: support/v2
+      # This branch pattern applies to the following branches as of approximately 02/27/2025 15:28:20:
+      # support/v1
+
+      # Specifies whether this branch can be deleted. boolean
+      allowsDeletions: false
+      # Specifies whether forced pushes are allowed on this branch. boolean
+      allowsForcePushes: false
+      # Specifies whether new commits pushed to the matching branches dismiss pull request review approvals. boolean
+      dismissStaleReviews: true
+      # Specifies whether admins can overwrite branch protection. boolean
+      isAdminEnforced: true
+      # Indicates whether "Require a pull request before merging" is enabled. boolean
+      requiresPullRequestBeforeMerging: true
+      # Specifies the number of pull request reviews before merging. int (0-6). Should be null/empty if PRs are not required
+      requiredApprovingReviewsCount: 1
+      # Require review from Code Owners. Requires requiredApprovingReviewsCount. boolean
+      requireCodeOwnersReview: true
+      # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines.
+      requiresCommitSignatures: false
+      # Are conversations required to be resolved before merging? boolean
+      requiresConversationResolution: true
+      # Are merge commits prohibited from being pushed to this branch. boolean
+      requiresLinearHistory: false
+      # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status
+      requiredStatusChecks:
+      - license/cla
+      - CodeQL
+      - Continuous Integration
+      # Require branches to be up to date before merging. boolean
+      requiresStrictStatusChecks: false
+      # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush.
+      restrictsPushes: false
+      # Restrict who can dismiss pull request reviews. boolean
+      restrictsReviewDismissals: false
+

.github/release-please.yml

@@ -3,5 +3,8 @@ primaryBranch: main
 handleGHRelease: true
 branches:
   - branch: support/v1
+    manifest: true
+    handleGHRelease: true
+  - branch: support/v2
     manifest: true
     handleGHRelease: true

.github/workflows/codeql-analysis.yml

@@ -2,7 +2,7 @@ name: CodeQL Analysis
 
 on:
   push:
-    branches: [ main, support/v1 ]
+    branches: [ main, support/v1, support/v2 ]
   pull_request:
   schedule:
     - cron: '0 8 * * *'

.github/workflows/release-please-gha.yml

@@ -15,6 +15,7 @@ on:
     branches:
       - main
       - support/v1
+      - support/v2
 
 jobs:
   release:

src/Microsoft.OpenApi/Models/OpenApiConstants.cs

@@ -245,6 +245,11 @@ public static class OpenApiConstants
         /// </summary>
         public const string Wrapped = "wrapped";
 
+        /// <summary>
+        /// Field: NodeType
+        /// </summary>
+        public const string NodeType = "nodeType";
+
         /// <summary>
         /// Field: In
         /// </summary>

src/Microsoft.OpenApi/Models/OpenApiXml.cs

@@ -30,13 +30,40 @@ public class OpenApiXml : IOpenApiSerializable, IOpenApiExtensible
         /// Declares whether the property definition translates to an attribute instead of an element.
         /// Default value is false.
         /// </summary>
-        public bool Attribute { get; set; }
+        [Obsolete("Use NodeType property instead. This property will be removed in a future version.")]
+        internal bool Attribute
+        {
+            get
+            {
+                return NodeType == OpenApiXmlNodeType.Attribute;
+            }
+            set
+            {
+                NodeType = value ? OpenApiXmlNodeType.Attribute : OpenApiXmlNodeType.None;
+            }
+        }
 
         /// <summary>
         /// Signifies whether the array is wrapped.
         /// Default value is false.
         /// </summary>
-        public bool Wrapped { get; set; }
+        [Obsolete("Use NodeType property instead. This property will be removed in a future version.")]
+        internal bool Wrapped
+        {
+            get
+            {
+                return NodeType == OpenApiXmlNodeType.Element;
+            }
+            set
+            {
+                NodeType = value ? OpenApiXmlNodeType.Element : OpenApiXmlNodeType.None;
+            }
+        }
+
+        /// <summary>
+        /// The node type of the XML representation.
+        /// </summary>
+        public OpenApiXmlNodeType? NodeType { get; set; }
 
         /// <summary>
         /// Specification Extensions.
@@ -56,8 +83,7 @@ public OpenApiXml(OpenApiXml xml)
             Name = xml?.Name ?? Name;
             Namespace = xml?.Namespace ?? Namespace;
             Prefix = xml?.Prefix ?? Prefix;
-            Attribute = xml?.Attribute ?? Attribute;
-            Wrapped = xml?.Wrapped ?? Wrapped;
+            NodeType = xml?.NodeType ?? NodeType;
             Extensions = xml?.Extensions != null ? new Dictionary<string, IOpenApiExtension>(xml.Extensions) : null;
         }
 
@@ -108,11 +134,25 @@ private void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
             // prefix
             writer.WriteProperty(OpenApiConstants.Prefix, Prefix);
 
-            // attribute
-            writer.WriteProperty(OpenApiConstants.Attribute, Attribute, false);
-
-            // wrapped
-            writer.WriteProperty(OpenApiConstants.Wrapped, Wrapped, false);
+            // For OpenAPI 3.2.0 and above, serialize nodeType
+            if (specVersion >= OpenApiSpecVersion.OpenApi3_2)
+            {
+                if (NodeType.HasValue)
+                {
+                    writer.WriteProperty(OpenApiConstants.NodeType, NodeType.Value.GetDisplayName());
+                }
+            }
+            else
+            {
+                // For OpenAPI 3.1.0 and below, serialize attribute and wrapped
+                // Use backing fields if they were set via obsolete properties,
+                // otherwise derive from NodeType if set
+                var attribute = NodeType.HasValue && NodeType == OpenApiXmlNodeType.Attribute;
+                var wrapped = NodeType.HasValue && NodeType == OpenApiXmlNodeType.Element;
+                
+                writer.WriteProperty(OpenApiConstants.Attribute, attribute, false);
+                writer.WriteProperty(OpenApiConstants.Wrapped, wrapped, false);
+            }
 
             // extensions
             writer.WriteExtensions(Extensions, specVersion);

src/Microsoft.OpenApi/Models/OpenApiXmlNodeType.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Microsoft.OpenApi
+{
+    /// <summary>
+    /// The type of the XML node
+    /// </summary>
+    public enum OpenApiXmlNodeType
+    {
+        /// <summary>
+        /// Element node type
+        /// </summary>
+        [Display("element")] Element,
+
+        /// <summary>
+        /// Attribute node type
+        /// </summary>
+        [Display("attribute")] Attribute,
+
+        /// <summary>
+        /// Text node type
+        /// </summary>
+        [Display("text")] Text,
+
+        /// <summary>
+        /// CDATA node type
+        /// </summary>
+        [Display("cdata")] Cdata,
+
+        /// <summary>
+        /// None node type
+        /// </summary>
+        [Display("none")] None
+    }
+}

src/Microsoft.OpenApi/Reader/V2/OpenApiXmlDeserializer.cs

@@ -42,7 +42,9 @@ internal static partial class OpenApiV2Deserializer
                     var attribute = n.GetScalarValue();
                     if (attribute is not null)
                     {
+#pragma warning disable CS0618 // Type or member is obsolete
                         o.Attribute = bool.Parse(attribute);
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
                 }
             },
@@ -53,7 +55,9 @@ internal static partial class OpenApiV2Deserializer
                     var wrapped = n.GetScalarValue();
                     if (wrapped is not null)
                     {
+#pragma warning disable CS0618 // Type or member is obsolete
                         o.Wrapped = bool.Parse(wrapped);
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
                 }
             },

src/Microsoft.OpenApi/Reader/V3/OpenApiXmlDeserializer.cs

@@ -39,7 +39,9 @@ internal static partial class OpenApiV3Deserializer
                     var attribute = n.GetScalarValue();
                     if (attribute is not null)
                     {
+#pragma warning disable CS0618 // Type or member is obsolete
                         o.Attribute = bool.Parse(attribute);
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
                 }
             },
@@ -50,7 +52,9 @@ internal static partial class OpenApiV3Deserializer
                     var wrapped = n.GetScalarValue();
                     if (wrapped is not null)
                     {
+#pragma warning disable CS0618 // Type or member is obsolete
                         o.Wrapped = bool.Parse(wrapped);
+#pragma warning restore CS0618 // Type or member is obsolete
                     }
                 }
             },