Merge pull request #1903 from microsoft/mk/sync-vnext-changes

Sync latest vnext changes

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/Microsoft.OpenApi.Hidi.csproj

@@ -9,7 +9,7 @@
     <Nullable>enable</Nullable>
     <ToolCommandName>hidi</ToolCommandName>
     <PackageOutputPath>./../../artifacts</PackageOutputPath>
-    <Version>1.4.13</Version>
+    <Version>1.4.14</Version>
     <Description>OpenAPI.NET CLI tool for slicing OpenAPI documents</Description>
     <SignAssembly>true</SignAssembly>
     <!-- https://github.com/dotnet/sourcelink/blob/main/docs/README.md#embeduntrackedsources -->
@@ -39,7 +39,7 @@
     </PackageReference>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
     <PackageReference Include="Microsoft.OData.Edm" Version="8.1.0" />
-    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.6" />
+    <PackageReference Include="Microsoft.OpenApi.OData" Version="2.0.0-preview.7" />
     <PackageReference Include="Microsoft.OpenApi.ApiManifest" Version="0.5.0-preview" />
     <PackageReference Include="System.CommandLine.Hosting" Version="0.4.0-alpha.22272.1" />
     <!--STJ

src/Microsoft.OpenApi/Extensions/OpenApiTypeMapper.cs

@@ -99,8 +99,8 @@ public static JsonSchemaType ToJsonSchemaType(this string identifier)
         /// Other types including nullables and URL are also supported.
         /// Common Name      type    format      Comments
         /// ===========      ======= ======      =========================================
-        /// integer          integer int32       signed 32 bits
-        /// long             integer int64       signed 64 bits
+        /// integer          number int32       signed 32 bits
+        /// long             number int64       signed 64 bits
         /// float            number  float
         /// double           number  double
         /// string           string  [empty]

test/Microsoft.OpenApi.Readers.Tests/OpenApiReaderTests/OpenApiStreamReaderTests.cs

@@ -61,7 +61,7 @@ public async Task StreamShouldReadWhenInitializedAsync()
                 BaseAddress = new Uri("https://raw.githubusercontent.com/OAI/OpenAPI-Specification/")
             };
 
-            var stream = await httpClient.GetStreamAsync("master/examples/v3.0/petstore.yaml");
+            var stream = await httpClient.GetStreamAsync("20fe7a7b720a0e48e5842d002ac418b12a8201df/tests/v3.0/pass/petstore.yaml");
 
             // Read V3 as YAML
             var result = OpenApiDocument.Load(stream, "yaml");

test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Moq" Version="4.20.72" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SharpYaml" Version="2.1.1" />
-    <PackageReference Include="Verify.Xunit" Version="27.0.1" />
+    <PackageReference Include="Verify.Xunit" Version="28.0.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" PrivateAssets="all" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />