Apply suggestions from code review

Author: baywet

src/Microsoft.OpenApi/Models/OpenApiServer.cs

@@ -97,10 +97,14 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
             // name - serialize as native field for v3.2+ or as extension for earlier versions
             if (!string.IsNullOrEmpty(Name))
             {
-                if (version == OpenApiSpecVersion.OpenApi3_2)
+                if (version >= OpenApiSpecVersion.OpenApi3_2)
                 {
                     writer.WriteProperty(OpenApiConstants.Name, Name);
                 }
+                else
+                {
+                    writer.WriteProperty("x-oai-name", Name);
+                }
             }
 
             // description
@@ -110,16 +114,7 @@ private void SerializeInternal(IOpenApiWriter writer, OpenApiSpecVersion version
             writer.WriteOptionalMap(OpenApiConstants.Variables, Variables, callback);
 
             // specification extensions
-            var extensionsToWrite = Extensions;
-
-            // For non-v3.2 versions, add x-oai-name extension if Name is present
-            if (!string.IsNullOrEmpty(Name) && version != OpenApiSpecVersion.OpenApi3_2)
-            {
-                extensionsToWrite = new Dictionary<string, IOpenApiExtension>(Extensions ?? new Dictionary<string, IOpenApiExtension>());
-                extensionsToWrite["x-oai-name"] = new JsonNodeExtension(JsonValue.Create(Name)!);
-            }
-            
-            writer.WriteExtensions(extensionsToWrite, version);
+            writer.WriteExtensions(Extensions, version);
 
             writer.WriteEndObject();
         }

test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs

@@ -127,9 +127,7 @@ public async Task SerializeServerWithNameAsV32JsonWorks()
             var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_2);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            Assert.Equal(expected, actual);
+             Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
@@ -149,9 +147,7 @@ public async Task SerializeServerWithNameAsV31JsonWorks()
             var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            Assert.Equal(expected, actual);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]
@@ -171,9 +167,7 @@ public async Task SerializeServerWithNameAsV3JsonWorks()
             var actual = await ServerWithName.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0);
 
             // Assert
-            actual = actual.MakeLineBreaksEnvironmentNeutral();
-            expected = expected.MakeLineBreaksEnvironmentNeutral();
-            Assert.Equal(expected, actual);
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
         }
 
         [Fact]