microsoft · andrueastman · Feb 6, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
@@ -6,7 +6,6 @@ trigger:
  branches:
    include:
    - main
-    - dev
    - support/v1
  tags:
    include:
@@ -15,7 +14,6 @@ pr:
  branches:
    include:
    - main
-    - dev
    - support/v1
 variables:
  buildPlatform: 'Any CPU'

@@ -2,7 +2,7 @@ name: CodeQL Analysis

 on:
  push:
-    branches: [ main, dev ]
+    branches: [ main, support/v1 ]
  pull_request:
  schedule:
    - cron: '0 8 * * *'

@@ -2,11 +2,13 @@ name: Publish Docker image
 on:
  workflow_dispatch:
  push:
-    branches: [main, dev, support/v1]
-    paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
+    tags: ["v*"]
+    branches: [main]
+  pull_request:
 env:
  REGISTRY: msgraphprod.azurecr.io
  IMAGE_NAME: public/openapi/hidi
+  PREVIEW_BRANCH: "refs/heads/main"
 jobs:
  push_to_registry:
    environment:
@@ -28,14 +30,24 @@ jobs:
          echo "::set-output name=version::${version}"
        shell: pwsh
        id: getversion
+      - name: Get truncated run number
+        if: contains(github.ref, env.PREVIEW_BRANCH)
+        id: runnumber
+        run: echo "runnumber=$(echo ${{ github.run_number }} |  awk '{ print substr($0, length($0)-3, length($0)) }')" >> $GITHUB_OUTPUT
+      - name: Get current date
+        if: contains(github.ref, env.PREVIEW_BRANCH)
+        id: date
+        run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
      - name: Push to registry - Nightly
-        if: ${{ github.ref == 'refs/heads/dev' }}
+        if: contains(github.ref, env.PREVIEW_BRANCH)
        uses: docker/build-push-action@v6.13.0
        with:
          push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}-preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
+          build-args: |
+            version_suffix=preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
      - name: Push to registry - Release
-        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/support/v1' }}
+        if: contains(github.ref, 'refs/tags/v')
        uses: docker/build-push-action@v6.13.0
        with:
          push: true

@@ -1,3 +1,3 @@
 {
-  ".": "2.0.0-preview5"
+  ".": "2.0.0-preview6"
 }
@@ -12,15 +12,13 @@
    <PackageProjectUrl>https://github.com/Microsoft/OpenAPI.NET</PackageProjectUrl>
    <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
    <PackageTags>OpenAPI .NET</PackageTags>
-    <Version>2.0.0-preview5</Version>
+    <Version>2.0.0-preview6</Version>
  </PropertyGroup>
  <!-- https://github.com/clairernovotny/DeterministicBuilds#deterministic-builds -->
  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
      <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference
-     Condition="!$(MSBuildProjectName.EndsWith('Tests'))"
-     Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+    <PackageReference Condition="!$(MSBuildProjectName.EndsWith('Tests'))" Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
  </ItemGroup>
 </Project>
@@ -185,7 +185,7 @@
        /// Initializes a copy of <see cref="IOpenApiSchema"/> object
        /// </summary>
        /// <param name="schema">The schema object to copy from.</param>
        internal OpenApiSchema(IOpenApiSchema schema)
        {
            Utils.CheckArgumentNull(schema);
            Title = schema.Title ?? Title;
@@ -413,7 +413,7 @@
        internal void WriteAsItemsProperties(IOpenApiWriter writer)
        {
            // type
-            writer.WriteProperty(OpenApiConstants.Type, Type.ToIdentifier());
+            writer.WriteProperty(OpenApiConstants.Type, (Type & ~JsonSchemaType.Null).ToIdentifier());

            // format
            WriteFormatProperty(writer);
@@ -626,7 +626,7 @@
            writer.WriteEndObject();
        }

        private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer, OpenApiSpecVersion version)
        {
            // check whether nullable is true for upcasting purposes
            var isNullable = (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null))  ||
@@ -714,7 +714,7 @@
        private static readonly Array jsonSchemaTypeValues = System.Enum.GetValues(typeof(JsonSchemaType));
 #endif

        private void DowncastTypeArrayToV2OrV3(JsonSchemaType schemaType, IOpenApiWriter writer, OpenApiSpecVersion version)
        {
            /* If the array has one non-null value, emit Type as string
            * If the array has one null value, emit x-nullable as true

@@ -624,6 +624,36 @@ public async Task SerializeSchemaWithUnrecognizedPropertiesWorks()
            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
        }

+        [Fact]
+        public async Task WriteAsItemsPropertiesDoesNotWriteNull()
+        {
+            // Arrange
+            var schema = new OpenApiSchema
+            {
+                Type = JsonSchemaType.Number | JsonSchemaType.Null
+            };
+
+            var outputStringWriter = new StringWriter(CultureInfo.InvariantCulture);
+            var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = false });
+            writer.WriteStartObject();
+
+            // Act
+            schema.WriteAsItemsProperties(writer);
+            writer.WriteEndObject();
+            await writer.FlushAsync();
+
+            // Assert
+            var actual = outputStringWriter.GetStringBuilder().ToString();
+            var expected =
+            """
+            {
+                "type": "number"
+            }
+            """;
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(expected), JsonNode.Parse(actual)));
+        }
+
+
        internal class SchemaVisitor : OpenApiVisitorBase
        {
            public List<string> Titles = new();
-Original file line number
+Diff line change
@@ -185,7 +185,7 @@
             /// Initializes a copy of <see cref="IOpenApiSchema"/> object
             /// </summary>
             /// <param name="schema">The schema object to copy from.</param>
             internal OpenApiSchema(IOpenApiSchema schema)
     Check warning
        on line 188
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this constructor to reduce its Cognitive Complexity from 18 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
  




        
  
  
      
  
  
    Check warning
        on line 188
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this constructor to reduce its Cognitive Complexity from 18 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
  




        
  
  
      
  
  
    Check warning
        on line 188
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this constructor to reduce its Cognitive Complexity from 18 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
  




        
  
  
      
  
  
    Check warning
        on line 188
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this constructor to reduce its Cognitive Complexity from 18 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
             {
                 Utils.CheckArgumentNull(schema);
                 Title = schema.Title ?? Title;
@@ -413,7 +413,7 @@
             internal void WriteAsItemsProperties(IOpenApiWriter writer)
             {
                 // type
-                writer.WriteProperty(OpenApiConstants.Type, Type.ToIdentifier());
+                writer.WriteProperty(OpenApiConstants.Type, (Type & ~JsonSchemaType.Null).ToIdentifier());
                 // format
                 WriteFormatProperty(writer);
@@ -626,7 +626,7 @@
                 writer.WriteEndObject();
             }
             private void SerializeTypeProperty(JsonSchemaType? type, IOpenApiWriter writer, OpenApiSpecVersion version)
     Check warning
        on line 629
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
  




        
  
  
      
  
  
    Check warning
        on line 629
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
  




        
  
  
      
  
  
    Check warning
        on line 629
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Refactor this method to reduce its Cognitive Complexity from 17 to the 15 allowed. (https://rules.sonarsource.com/csharp/RSPEC-3776)
             {
                 // check whether nullable is true for upcasting purposes
                 var isNullable = (Type.HasValue && Type.Value.HasFlag(JsonSchemaType.Null))  ||
@@ -714,7 +714,7 @@
             private static readonly Array jsonSchemaTypeValues = System.Enum.GetValues(typeof(JsonSchemaType));
     #endif
             private void DowncastTypeArrayToV2OrV3(JsonSchemaType schemaType, IOpenApiWriter writer, OpenApiSpecVersion version)
     Check warning
        on line 717
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Make 'DowncastTypeArrayToV2OrV3' a static method. (https://rules.sonarsource.com/csharp/RSPEC-2325)
  




        
  
  
      
  
  
    Check warning
        on line 717
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Make 'DowncastTypeArrayToV2OrV3' a static method. (https://rules.sonarsource.com/csharp/RSPEC-2325)
  




        
  
  
      
  
  
    Check warning
        on line 717
        in src/Microsoft.OpenApi/Models/OpenApiSchema.cs
  



  
      
View workflow job for this annotation

  

  
    
    GitHub Actions / Build
  

  
    
      
    
  

  
    Make 'DowncastTypeArrayToV2OrV3' a static method. (https://rules.sonarsource.com/csharp/RSPEC-2325)
             {
                 /* If the array has one non-null value, emit Type as string
                 * If the array has one null value, emit x-nullable as true
-          Expand Down