Merge pull request #2126 from microsoft/dev

refresh main

Author: andrueastman

.azure-pipelines/ci-build.yml

@@ -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'

.github/workflows/codeql-analysis.yml

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

.github/workflows/docker.yml

@@ -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/[email protected]
         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/[email protected]
         with:
           push: true

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "2.0.0-preview5"
+  ".": "2.0.0-preview6"
 }

CHANGELOG.md

@@ -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>

Directory.Build.props

@@ -413,7 +413,7 @@ internal void WriteJsonSchemaKeywords(IOpenApiWriter writer)
         internal void WriteAsItemsProperties(IOpenApiWriter writer)
         {
             // type
-            writer.WriteProperty(OpenApiConstants.Type, Type.ToIdentifier());
+            writer.WriteProperty(OpenApiConstants.Type, (Type & ~JsonSchemaType.Null).ToIdentifier());
 
             // format
             WriteFormatProperty(writer);

src/Microsoft.OpenApi/Models/OpenApiSchema.cs

@@ -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();