Merge branch 'master' into is/fix-operation-tag-names

Author: irvinesunday

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

@@ -195,8 +195,8 @@ public static OpenApiSchema CreateSchema(this ODataContext context, IEdmPrimitiv
                 case EdmPrimitiveTypeKind.Double: // double
                     schema.OneOf = new List<OpenApiSchema>
                     {
-                        new OpenApiSchema { Type = Constants.NumberType, Format = "double" },
-                        new OpenApiSchema { Type = Constants.StringType },
+                        new OpenApiSchema { Type = Constants.NumberType, Format = "double", Nullable = true },
+                        new OpenApiSchema { Type = Constants.StringType, Nullable = true },
                         new OpenApiSchema
                         {
                             UnresolvedReference = true,

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

@@ -121,12 +121,14 @@ public static IDictionary<string, OpenApiSchema> CreateSchemas(this ODataContext
 
             schemas[Constants.ReferenceNumericName] = new()
             {
-                Enum = new List<IOpenApiAny>
-                {
+                Type = Constants.StringType,
+                Nullable = true,
+                Enum =
+                [
                     new OpenApiString("-INF"),
                     new OpenApiString("INF"),
                     new OpenApiString("NaN")
-                }
+                ]
             };
 
             if (context.Settings.EnableODataAnnotationReferencesForResponses)

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

@@ -25,6 +25,7 @@
 		- Cleaned up obsolete APIs
 		- Changed target framework to net8.0
 		- Adds support for retrieving collection of enum values from UpdateMethod property of UpdateRestrictions annotation #564
+		- Adds nullable to double schema conversions #581
 		- Updates tag names for actions/functions operations #585
 	</PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
@@ -45,8 +46,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.OData.Edm" Version="8.0.1" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.21" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="8.0.2" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/OoasGui/OoasGui.csproj

@@ -16,8 +16,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.OData.Edm" Version="8.0.1" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.21" />
+    <PackageReference Include="Microsoft.OData.Edm" Version="8.0.2" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>

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

@@ -1105,10 +1105,12 @@ public void NonNullableDoublePropertyWithDefaultStringWorks()
   ""oneOf"": [
     {
       ""type"": ""number"",
-      ""format"": ""double""
+      ""format"": ""double"",
+      ""nullable"": true
     },
     {
-      ""type"": ""string""
+      ""type"": ""string"",
+      ""nullable"": true
     },
     {
       ""$ref"": ""#/components/schemas/ReferenceNumeric""

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

@@ -73,8 +73,8 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.21" />
-    <PackageReference Include="xunit" Version="2.9.1" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.22" />
+    <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.json

@@ -1152,7 +1152,8 @@
         "-INF",
         "INF",
         "NaN"
-      ]
+      ],
+      "type": "string"
     }
   },
   "parameters": {

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.V2.yaml

@@ -757,6 +757,7 @@ definitions:
       - '-INF'
       - INF
       - NaN
+    type: string
 parameters:
   top:
     in: query

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.json

@@ -1258,7 +1258,9 @@
           "-INF",
           "INF",
           "NaN"
-        ]
+        ],
+        "type": "string",
+        "nullable": true
       }
     },
     "responses": {

test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Basic.OpenApi.yaml

@@ -829,6 +829,8 @@ components:
         - '-INF'
         - INF
         - NaN
+      type: string
+      nullable: true
   responses:
     error:
       description: error