Merge master onto feature branch

Author: irvinesunday

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

@@ -15,7 +15,7 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackageId>Microsoft.OpenApi.OData</PackageId>
     <SignAssembly>true</SignAssembly>
-    <Version>1.5.0-preview4</Version>
+    <Version>1.5.0-preview5</Version>
     <Description>This package contains the codes you need to convert OData CSDL to Open API Document of Model.</Description>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <PackageTags>Microsoft OpenApi OData EDM</PackageTags>
@@ -25,6 +25,7 @@
 - Updates README #13, #253, #40
 - Fixes casing in default propertyName for `innerError` in the `ErrorMainSchema`
 - Adds support for `x-ms-enum-flags` extension for flagged enums
+- Use containment together with `RequiresExplicitBinding` annotation to check whether to append bound operations to navigation properties #430
     </PackageReleaseNotes>
     <AssemblyName>Microsoft.OpenApi.OData.Reader</AssemblyName>
     <AssemblyOriginatorKeyFile>..\..\tool\Microsoft.OpenApi.OData.snk</AssemblyOriginatorKeyFile>
@@ -45,7 +46,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.OData.Edm" Version="7.18.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.9" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.4" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Microsoft.OpenApi.OData.Reader/PathItem/RefPathItemHandler.cs

@@ -66,7 +66,7 @@ protected override void SetOperations(OpenApiPathItem item)
             }
 
             // So far, we only consider the non-containment
-            Debug.Assert(!NavigationProperty.ContainsTarget);
+            //Debug.Assert(!NavigationProperty.ContainsTarget);
 
             // Create the ref
             if (NavigationProperty.TargetMultiplicity() == EdmMultiplicity.Many)

src/OoasGui/MainForm.cs

@@ -52,6 +52,17 @@ public MainForm()
 
             csdlRichTextBox.WordWrap = false;
             oasRichTextBox.WordWrap = false;
+
+
+            verifyEdmModelcheckBox.Checked = false;
+            yamlRadioBtn.Checked = true;
+
+
+            Settings.EnableKeyAsSegment = true;
+            Settings.PrefixEntityTypeNameBeforeKey = true;
+            Settings.EnableDiscriminatorValue = true;
+            Settings.ExpandDerivedTypesNavigationProperties = true;
+         
         }
 
         private async void jsonRadioBtn_CheckedChanged(object sender, EventArgs e)

src/OoasGui/OoasGui.csproj

@@ -17,7 +17,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.OData.Edm" Version="7.18.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.9" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.4" />
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
 </Project>

tool/UpdateDocs/UpdateDocs.csproj

@@ -13,6 +13,6 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.OData.Edm" Version="7.18.0" />
-    <PackageReference Include="Microsoft.OpenApi" Version="1.6.9" />
+    <PackageReference Include="Microsoft.OpenApi" Version="1.6.4" />
   </ItemGroup>
 </Project>