Merge pull request #663 from microsoft/dependabot/nuget/Microsoft.OpenApi-2.0.0-preview9

chore(deps): bump Microsoft.OpenApi from 2.0.0-preview8 to 2.0.0-preview9

Author: baywet

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiEdmTypeSchemaGenerator.cs

@@ -150,7 +150,7 @@ public static IOpenApiSchema CreateSchema(this ODataContext context, IEdmPrimiti
 
                 // Nullable properties are marked with the keyword nullable and a value of true.
                 // nullable cannot be true when type is empty, often common in anyof/allOf since individual entries are nullable
-                if (!string.IsNullOrEmpty(schema.Type.ToIdentifier()) && primitiveType.IsNullable)
+                if (schema.Type.ToIdentifiers() is { Length: > 0 } && primitiveType.IsNullable)
                 {
                     openApiSchema.Type |= JsonSchemaType.Null;
                 }

src/Microsoft.OpenApi.OData.Reader/Generator/OpenApiSchemaGenerator.cs

@@ -659,7 +659,7 @@ private static JsonNode GetTypeNameForPrimitive(ODataContext context, IEdmTypeRe
                 }
                 else
                 {
-                    return schema.Type.ToIdentifier() ??
+                    return (schema.Type & ~JsonSchemaType.Null)?.ToIdentifiers()[0] ??
                         (schema.AnyOf ?? Enumerable.Empty<IOpenApiSchema>())
                         .Union(schema.AllOf ?? Enumerable.Empty<IOpenApiSchema>())
                         .Union(schema.OneOf ?? Enumerable.Empty<IOpenApiSchema>())

src/Microsoft.OpenApi.OData.Reader/Microsoft.OpenAPI.OData.Reader.csproj

@@ -29,7 +29,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview8" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview9" />
 	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
 	<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.13.2">
 	  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/OoasGui/OoasGui.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net8.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview8" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview9" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSchemaGeneratorTests.cs

@@ -512,7 +512,7 @@ public async Task CreateComplexTypeWithBaseSchemaReturnCorrectSchema()
 
             // Assert
             Assert.NotNull(schema);
-            Assert.True(String.IsNullOrEmpty(schema.Type.ToIdentifier()));
+            Assert.Null(schema.Type.ToIdentifiers());
 
             Assert.NotNull(schema.AllOf);
             Assert.Null(schema.AnyOf);
@@ -660,7 +660,7 @@ public async Task CreateEntityTypeWithBaseSchemaReturnCorrectSchema()
 
             // Assert
             Assert.NotNull(schema);
-            Assert.True(String.IsNullOrEmpty(schema.Type.ToIdentifier()));
+            Assert.Null(schema.Type.ToIdentifiers());
 
             Assert.NotNull(schema.AllOf);
             Assert.Null(schema.AnyOf);
@@ -735,7 +735,7 @@ public void CreateEntityTypeWithCrossReferenceBaseSchemaReturnCorrectSchema()
 
             // Assert
             Assert.NotNull(schema);
-            Assert.True(string.IsNullOrEmpty(schema.Type.ToIdentifier()));
+            Assert.Null(schema.Type.ToIdentifiers());
 
             Assert.NotNull(schema.AllOf);
             Assert.Null(schema.AnyOf);

test/Microsoft.OpenAPI.OData.Reader.Tests/Microsoft.OpenAPI.OData.Reader.Tests.csproj

@@ -88,7 +88,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview8" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview9" />
     <PackageReference Include="moq" Version="4.20.72" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="xunit" Version="2.9.3" />

tool/UpdateDocs/UpdateDocs.csproj

@@ -13,6 +13,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.OData.Edm" Version="8.2.3" />
-    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview8" />
+    <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview9" />
   </ItemGroup>
 </Project>