From 0fc32f0cd94371fc3f03e6f6748851449d7ea653 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Mon, 17 Jan 2022 11:55:25 +0300
Subject: [PATCH 1/9] Remove unnecessary code

---
 .../Edm/EdmModelExtensions.cs                 | 38 +------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
index 7631419d..4755298c 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
@@ -124,43 +124,7 @@ public static IEnumerable<IEdmEntityType> FindAllBaseTypes(this IEdmEntityType e
                 current = current.BaseEntityType();
             }
         }
-
-        /// <summary>
-        /// Checks if the <paramref name="baseType"/> is assignable to <paramref name="subtype"/>.
-        /// In other words, if <paramref name="subtype"/> is a subtype of <paramref name="baseType"/> or not.
-        /// </summary>
-        /// <param name="baseType">Type of the base type.</param>
-        /// <param name="subtype">Type of the sub type.</param>
-        /// <returns>true, if the <paramref name="baseType"/> is assignable to <paramref name="subtype"/>. Otherwise returns false.</returns>
-        public static bool IsAssignableFrom(this IEdmEntityType baseType, IEdmEntityType subtype)
-        {
-            Utils.CheckArgumentNull(baseType, nameof(baseType));
-            Utils.CheckArgumentNull(subtype, nameof(subtype));
-
-            if (baseType.TypeKind != subtype.TypeKind)
-            {
-                return false;
-            }
-
-            if (subtype.IsEquivalentTo(baseType))
-            {
-                return true;
-            }
-
-            IEdmStructuredType structuredSubType = subtype;
-            while (structuredSubType != null)
-            {
-                if (structuredSubType.IsEquivalentTo(baseType))
-                {
-                    return true;
-                }
-
-                structuredSubType = structuredSubType.BaseType;
-            }
-
-            return false;
-        }
-
+                
         /// <summary>
         /// Check whether the operation is overload in the model.
         /// </summary>

From 3355bb85075deaeb17422cc2751c6f239b9cf55a Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Mon, 17 Jan 2022 11:56:09 +0300
Subject: [PATCH 2/9] Expand nav. prop. based on identifier name and not type

---
 .../Edm/ODataPathProvider.cs                  | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
index baa37717..28736b85 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -273,6 +273,15 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
             Debug.Assert(navigationProperty != null);
             Debug.Assert(currentPath != null);
 
+            // Check whether the navigation property has already been navigated in the path
+            foreach (ODataSegment segment in currentPath)
+            {
+                if (navigationProperty.Name.Equals(segment.Identifier))
+                {
+                    return;
+                }
+            }
+
             // Check whether the navigation property should be part of the path
             NavigationRestrictionsType navigation = _model.GetRecord<NavigationRestrictionsType>(navigationProperty, CapabilitiesConstants.NavigationRestrictions);
             if (navigation != null && !navigation.IsNavigable)
@@ -281,7 +290,7 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
             }
 
             // test the expandable for the navigation property.
-            bool shouldExpand = ShouldExpandNavigationProperty(navigationProperty, currentPath);
+            bool shouldExpand = navigationProperty.ContainsTarget;
 
             // append a navigation property.
             currentPath.Push(new ODataNavigationPropertySegment(navigationProperty));
@@ -362,31 +371,7 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
                 }
             }
             currentPath.Pop();
-        }
-
-        private bool ShouldExpandNavigationProperty(IEdmNavigationProperty navigationProperty, ODataPath currentPath)
-        {
-            Debug.Assert(navigationProperty != null);
-            Debug.Assert(currentPath != null);
-
-            // not expand for the non-containment.
-            if (!navigationProperty.ContainsTarget)
-            {
-                return false;
-            }
-
-            // check the type is visited before, if visited, not expand it.
-            IEdmEntityType navEntityType = navigationProperty.ToEntityType();
-            foreach (ODataSegment segment in currentPath)
-            {
-                if (navEntityType.IsAssignableFrom(segment.EntityType))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
+        }              
 
         /// <summary>
         /// Create $ref paths.

From 475fca7a68508bb9fd8596ca514ee93b170e39f7 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Mon, 17 Jan 2022 13:12:00 +0300
Subject: [PATCH 3/9] Update tests

---
 .../Edm/ODataPathProviderTests.cs                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
index 6c578ff4..c1c975b3 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
@@ -48,7 +48,7 @@ public void GetPathsForGraphBetaModelReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(17178, paths.Count());
+            Assert.Equal(57490, paths.Count());
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void GetPathsForGraphBetaModelWithDerivedTypesConstraintReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(17163, paths.Count());
+            Assert.Equal(57469, paths.Count());
         }
 
         [Fact]

From bbed6d24dd68996387658af6ba7dc8d5e5a37bd7 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Mon, 17 Jan 2022 15:53:20 +0300
Subject: [PATCH 4/9] Update comment

---
 src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
index 28736b85..f2dc39ad 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -289,7 +289,7 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
                 return;
             }
 
-            // test the expandable for the navigation property.
+            // Whether to expand the navigation property
             bool shouldExpand = navigationProperty.ContainsTarget;
 
             // append a navigation property.

From 8d18b047f82d07aef077fc9c89eb1e27c9198f0b Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Mon, 17 Jan 2022 17:55:53 +0300
Subject: [PATCH 5/9] Re-add method and add obsolete attribute

---
 .../Edm/EdmModelExtensions.cs                 | 39 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 1 deletion(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
index 4755298c..d593d8a6 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/EdmModelExtensions.cs
@@ -124,7 +124,44 @@ public static IEnumerable<IEdmEntityType> FindAllBaseTypes(this IEdmEntityType e
                 current = current.BaseEntityType();
             }
         }
-                
+
+        /// <summary>
+        /// Checks if the <paramref name="baseType"/> is assignable to <paramref name="subtype"/>.
+        /// In other words, if <paramref name="subtype"/> is a subtype of <paramref name="baseType"/> or not.
+        /// </summary>
+        /// <param name="baseType">Type of the base type.</param>
+        /// <param name="subtype">Type of the sub type.</param>
+        /// <returns>true, if the <paramref name="baseType"/> is assignable to <paramref name="subtype"/>. Otherwise returns false.</returns>
+        [Obsolete]
+        public static bool IsAssignableFrom(this IEdmEntityType baseType, IEdmEntityType subtype)
+        {
+            Utils.CheckArgumentNull(baseType, nameof(baseType));
+            Utils.CheckArgumentNull(subtype, nameof(subtype));
+
+            if (baseType.TypeKind != subtype.TypeKind)
+            {
+                return false;
+            }
+
+            if (subtype.IsEquivalentTo(baseType))
+            {
+                return true;
+            }
+
+            IEdmStructuredType structuredSubType = subtype;
+            while (structuredSubType != null)
+            {
+                if (structuredSubType.IsEquivalentTo(baseType))
+                {
+                    return true;
+                }
+
+                structuredSubType = structuredSubType.BaseType;
+            }
+
+            return false;
+        }
+
         /// <summary>
         /// Check whether the operation is overload in the model.
         /// </summary>

From 2a0fe271b042137aa8e1e20f4268dd3071515c63 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Thu, 20 Jan 2022 14:38:43 +0300
Subject: [PATCH 6/9] Expand all containment navigation properties

Don't check on the defining type to determine whether or not to expand, but on whether the navigation property has already been navigated in the path
---
 .../Edm/ODataPathProvider.cs                  | 28 +++++++++++++------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
index 161fb29f..189c3a59 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -324,18 +324,28 @@ private void RetrieveMediaEntityStreamPaths(IEdmEntityType entityType, ODataPath
         /// <param name="count">The count restrictions.</param>
         /// <param name="currentPath">The current OData path.</param>
         /// <param name="convertSettings">The settings for the current conversion.</param>
-        private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationProperty, CountRestrictionsType count, ODataPath currentPath, OpenApiConvertSettings convertSettings)
+        /// <param name="visitedNavigationProperties">A stack that holds the visited navigation properties in the <paramref name="currentPath"/>.</param>
+        private void RetrieveNavigationPropertyPaths(
+            IEdmNavigationProperty navigationProperty,
+            CountRestrictionsType count,
+            ODataPath currentPath,
+            OpenApiConvertSettings convertSettings,
+            Stack<string> visitedNavigationProperties = null)
         {
             Debug.Assert(navigationProperty != null);
             Debug.Assert(currentPath != null);
 
+            if (visitedNavigationProperties == null)
+            {
+                visitedNavigationProperties = new Stack<string>();
+            }
+                        
+            var navPropFullyQualifiedName = $"{navigationProperty.DeclaringType.FullTypeName()}/{navigationProperty.Name}";
+
             // Check whether the navigation property has already been navigated in the path
-            foreach (ODataSegment segment in currentPath)
+            if (visitedNavigationProperties.Contains(navPropFullyQualifiedName))
             {
-                if (navigationProperty.Name.Equals(segment.Identifier))
-                {
-                    return;
-                }
+                return;
             }
 
             // Check whether the navigation property should be part of the path
@@ -351,6 +361,7 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
             // append a navigation property.
             currentPath.Push(new ODataNavigationPropertySegment(navigationProperty));
             AppendPath(currentPath.Clone());
+            visitedNavigationProperties.Push(navPropFullyQualifiedName);
 
             // Check whether a collection-valued navigation property should be indexed by key value(s).
             NavigationPropertyRestriction restriction = navigation?.RestrictedProperties?.FirstOrDefault();
@@ -421,7 +432,7 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
                         {
                             if (CanFilter(subNavProperty))
                             {
-                                RetrieveNavigationPropertyPaths(subNavProperty, count, currentPath, convertSettings);
+                                RetrieveNavigationPropertyPaths(subNavProperty, count, currentPath, convertSettings, visitedNavigationProperties);
                             }
                         }
                     }
@@ -430,9 +441,10 @@ private void RetrieveNavigationPropertyPaths(IEdmNavigationProperty navigationPr
                 if (targetsMany)
                 {
                     currentPath.Pop();
-                }
+                }                
             }
             currentPath.Pop();
+            visitedNavigationProperties.Pop();
         }              
 
         /// <summary>

From 0b05d214934aa7069b048b8a748a8f35e96030ec Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Thu, 20 Jan 2022 14:39:00 +0300
Subject: [PATCH 7/9] Update tests

---
 .../Edm/ODataPathProviderTests.cs                             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
index 739b36f7..1bf649f9 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
@@ -48,7 +48,7 @@ public void GetPathsForGraphBetaModelReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(50085, paths.Count());
+            Assert.Equal(1413958, paths.Count());
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void GetPathsForGraphBetaModelWithDerivedTypesConstraintReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(50070, paths.Count());
+            Assert.Equal(1413937, paths.Count());
         }
 
         [Fact]

From 808e768dd0709f301c685ff6566519ddfd5b2d3d Mon Sep 17 00:00:00 2001
From: Irvine Sunday <irochand@microsoft.com>
Date: Wed, 9 Feb 2022 12:06:21 +0300
Subject: [PATCH 8/9] Update Beta integration file and tests

---
 .../Edm/ODataPathProviderTests.cs             |  4 +-
 .../Resources/Graph.Beta.OData.xml            | 42 +++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
index 2d5b997b..aae0001c 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Edm/ODataPathProviderTests.cs
@@ -48,7 +48,7 @@ public void GetPathsForGraphBetaModelReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(28227, paths.Count());
+            Assert.Equal(26436, paths.Count());
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void GetPathsForGraphBetaModelWithDerivedTypesConstraintReturnsAllPaths()
 
             // Assert
             Assert.NotNull(paths);
-            Assert.Equal(28193, paths.Count());
+            Assert.Equal(26394, paths.Count());
         }
 
         [Fact]
diff --git a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Graph.Beta.OData.xml b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Graph.Beta.OData.xml
index adb78aa9..e8b90f17 100644
--- a/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Graph.Beta.OData.xml
+++ b/test/Microsoft.OpenAPI.OData.Reader.Tests/Resources/Graph.Beta.OData.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <?xml-stylesheet type='text/xsl' href='.\transforms\csdl\preprocess_csdl.xsl'?>
 <edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
   <edmx:DataServices>
@@ -7799,7 +7799,7 @@
         <Property Name="uid" Type="Edm.String" />
         <Property Name="webLink" Type="Edm.String" />
         <NavigationProperty Name="attachments" Type="Collection(graph.attachment)" ContainsTarget="true" />
-        <NavigationProperty Name="calendar" Type="graph.calendar" ContainsTarget="true" />
+        <NavigationProperty Name="calendar" Type="graph.calendar" />
         <NavigationProperty Name="exceptionOccurrences" Type="Collection(graph.event)" ContainsTarget="true" />
         <NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true" />
         <NavigationProperty Name="instances" Type="Collection(graph.event)" ContainsTarget="true" />
@@ -8120,11 +8120,11 @@
         <NavigationProperty Name="drive" Type="graph.drive" />
         <NavigationProperty Name="drives" Type="Collection(graph.drive)" />
         <NavigationProperty Name="externalColumns" Type="Collection(graph.columnDefinition)" />
-        <NavigationProperty Name="items" Type="Collection(graph.baseItem)" ContainsTarget="true" />
+        <NavigationProperty Name="items" Type="Collection(graph.baseItem)" />
         <NavigationProperty Name="lists" Type="Collection(graph.list)" ContainsTarget="true" />
         <NavigationProperty Name="pages" Type="Collection(graph.sitePage)" ContainsTarget="true" />
         <NavigationProperty Name="permissions" Type="Collection(graph.permission)" ContainsTarget="true" />
-        <NavigationProperty Name="sites" Type="Collection(graph.site)" ContainsTarget="true" />
+        <NavigationProperty Name="sites" Type="Collection(graph.site)" />
         <NavigationProperty Name="termStore" Type="microsoft.graph.termStore.store" ContainsTarget="true" />
         <NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true" />
       </EntityType>
@@ -13878,7 +13878,7 @@
         <Property Name="actor" Type="graph.identitySet" />
         <Property Name="times" Type="graph.itemActivityTimeSet" />
         <NavigationProperty Name="driveItem" Type="graph.driveItem" />
-        <NavigationProperty Name="listItem" Type="graph.listItem" ContainsTarget="true" />
+        <NavigationProperty Name="listItem" Type="graph.listItem" />
       </EntityType>
       <EntityType Name="driveItem" BaseType="graph.baseItem" OpenType="true">
         <Property Name="audio" Type="graph.audio" />
@@ -13908,9 +13908,9 @@
         <Property Name="video" Type="graph.video" />
         <Property Name="webDavUrl" Type="Edm.String" />
         <NavigationProperty Name="workbook" Type="graph.workbook" ContainsTarget="true" />
-        <NavigationProperty Name="activities" Type="Collection(graph.itemActivityOLD)" ContainsTarget="true" />
+        <NavigationProperty Name="activities" Type="Collection(graph.itemActivityOLD)" />
         <NavigationProperty Name="analytics" Type="graph.itemAnalytics" />
-        <NavigationProperty Name="children" Type="Collection(graph.driveItem)" ContainsTarget="true" />
+        <NavigationProperty Name="children" Type="Collection(graph.driveItem)" />
         <NavigationProperty Name="listItem" Type="graph.listItem" ContainsTarget="true" />
         <NavigationProperty Name="permissions" Type="Collection(graph.permission)" ContainsTarget="true" />
         <NavigationProperty Name="subscriptions" Type="Collection(graph.subscription)" ContainsTarget="true" />
@@ -15724,7 +15724,7 @@
         <Property Name="requestApprovalSettings" Type="graph.approvalSettings" />
         <Property Name="requestorSettings" Type="graph.requestorSettings" />
         <NavigationProperty Name="accessPackage" Type="graph.accessPackage" />
-        <NavigationProperty Name="accessPackageCatalog" Type="graph.accessPackageCatalog" ContainsTarget="true" />
+        <NavigationProperty Name="accessPackageCatalog" Type="graph.accessPackageCatalog" />
       </EntityType>
       <EntityType Name="accessPackageAssignmentRequest" BaseType="graph.entity">
         <Property Name="answers" Type="Collection(graph.accessPackageAnswer)" />
@@ -15738,14 +15738,14 @@
         <Property Name="requestType" Type="Edm.String" />
         <Property Name="schedule" Type="graph.requestSchedule" />
         <NavigationProperty Name="accessPackage" Type="graph.accessPackage" />
-        <NavigationProperty Name="accessPackageAssignment" Type="graph.accessPackageAssignment" ContainsTarget="true" />
+        <NavigationProperty Name="accessPackageAssignment" Type="graph.accessPackageAssignment" />
         <NavigationProperty Name="requestor" Type="graph.accessPackageSubject" ContainsTarget="true" />
       </EntityType>
       <EntityType Name="accessPackageAssignmentResourceRole" BaseType="graph.entity">
         <Property Name="originId" Type="Edm.String" />
         <Property Name="originSystem" Type="Edm.String" />
         <Property Name="status" Type="Edm.String" />
-        <NavigationProperty Name="accessPackageAssignments" Type="Collection(graph.accessPackageAssignment)" ContainsTarget="true" />
+        <NavigationProperty Name="accessPackageAssignments" Type="Collection(graph.accessPackageAssignment)" />
         <NavigationProperty Name="accessPackageResourceRole" Type="graph.accessPackageResourceRole" ContainsTarget="true" />
         <NavigationProperty Name="accessPackageResourceScope" Type="graph.accessPackageResourceScope" ContainsTarget="true" />
         <NavigationProperty Name="accessPackageSubject" Type="graph.accessPackageSubject" ContainsTarget="true" />
@@ -25182,8 +25182,8 @@
         <Property Name="sectionGroupsUrl" Type="Edm.String" />
         <Property Name="sectionsUrl" Type="Edm.String" />
         <NavigationProperty Name="parentNotebook" Type="graph.notebook" />
-        <NavigationProperty Name="parentSectionGroup" Type="graph.sectionGroup" ContainsTarget="true" />
-        <NavigationProperty Name="sectionGroups" Type="Collection(graph.sectionGroup)" ContainsTarget="true" />
+        <NavigationProperty Name="parentSectionGroup" Type="graph.sectionGroup" />
+        <NavigationProperty Name="sectionGroups" Type="Collection(graph.sectionGroup)" />
         <NavigationProperty Name="sections" Type="Collection(graph.onenoteSection)" ContainsTarget="true" />
       </EntityType>
       <EntityType Name="onenoteSection" BaseType="graph.onenoteEntityHierarchyModel">
@@ -25192,7 +25192,7 @@
         <Property Name="pagesUrl" Type="Edm.String" />
         <NavigationProperty Name="pages" Type="Collection(graph.onenotePage)" ContainsTarget="true" />
         <NavigationProperty Name="parentNotebook" Type="graph.notebook" />
-        <NavigationProperty Name="parentSectionGroup" Type="graph.sectionGroup" ContainsTarget="true" />
+        <NavigationProperty Name="parentSectionGroup" Type="graph.sectionGroup" />
       </EntityType>
       <EntityType Name="operation" BaseType="graph.entity">
         <Property Name="createdDateTime" Type="Edm.DateTimeOffset" />
@@ -25216,7 +25216,7 @@
         <Property Name="title" Type="Edm.String" />
         <Property Name="userTags" Type="Collection(Edm.String)" />
         <NavigationProperty Name="parentNotebook" Type="graph.notebook" />
-        <NavigationProperty Name="parentSection" Type="graph.onenoteSection" ContainsTarget="true" />
+        <NavigationProperty Name="parentSection" Type="graph.onenoteSection" />
       </EntityType>
       <EntityType Name="onenoteResource" BaseType="graph.onenoteEntityBaseModel">
         <Property Name="content" Type="Edm.Stream" />
@@ -25511,7 +25511,7 @@
         <Property Name="registeredRoot" Type="Edm.String" />
         <Property Name="status" Type="Edm.String" />
         <Property Name="type" Type="Edm.String" />
-        <NavigationProperty Name="parent" Type="graph.governanceResource" ContainsTarget="true" />
+        <NavigationProperty Name="parent" Type="graph.governanceResource" />
         <NavigationProperty Name="roleAssignmentRequests" Type="Collection(graph.governanceRoleAssignmentRequest)" ContainsTarget="true" />
         <NavigationProperty Name="roleAssignments" Type="Collection(graph.governanceRoleAssignment)" ContainsTarget="true" />
         <NavigationProperty Name="roleDefinitions" Type="Collection(graph.governanceRoleDefinition)" ContainsTarget="true" />
@@ -25528,7 +25528,7 @@
         <Property Name="status" Type="graph.governanceRoleAssignmentRequestStatus" />
         <Property Name="subjectId" Type="Edm.String" />
         <Property Name="type" Type="Edm.String" Nullable="false" />
-        <NavigationProperty Name="resource" Type="graph.governanceResource" ContainsTarget="true" />
+        <NavigationProperty Name="resource" Type="graph.governanceResource" />
         <NavigationProperty Name="roleDefinition" Type="graph.governanceRoleDefinition" ContainsTarget="true" />
         <NavigationProperty Name="subject" Type="graph.governanceSubject" ContainsTarget="true" />
       </EntityType>
@@ -25544,7 +25544,7 @@
         <Property Name="status" Type="Edm.String" Nullable="false" />
         <Property Name="subjectId" Type="Edm.String" />
         <NavigationProperty Name="linkedEligibleRoleAssignment" Type="graph.governanceRoleAssignment" />
-        <NavigationProperty Name="resource" Type="graph.governanceResource" ContainsTarget="true" />
+        <NavigationProperty Name="resource" Type="graph.governanceResource" />
         <NavigationProperty Name="roleDefinition" Type="graph.governanceRoleDefinition" ContainsTarget="true" />
         <NavigationProperty Name="subject" Type="graph.governanceSubject" ContainsTarget="true" />
       </EntityType>
@@ -25553,8 +25553,8 @@
         <Property Name="externalId" Type="Edm.String" />
         <Property Name="resourceId" Type="Edm.String" />
         <Property Name="templateId" Type="Edm.String" />
-        <NavigationProperty Name="resource" Type="graph.governanceResource" ContainsTarget="true" />
-        <NavigationProperty Name="roleSetting" Type="graph.governanceRoleSetting" ContainsTarget="true" />
+        <NavigationProperty Name="resource" Type="graph.governanceResource" />
+        <NavigationProperty Name="roleSetting" Type="graph.governanceRoleSetting" />
       </EntityType>
       <EntityType Name="governanceRoleSetting" BaseType="graph.entity">
         <Property Name="adminEligibleSettings" Type="Collection(graph.governanceRuleSetting)" />
@@ -25566,7 +25566,7 @@
         <Property Name="roleDefinitionId" Type="Edm.String" />
         <Property Name="userEligibleSettings" Type="Collection(graph.governanceRuleSetting)" />
         <Property Name="userMemberSettings" Type="Collection(graph.governanceRuleSetting)" />
-        <NavigationProperty Name="resource" Type="graph.governanceResource" ContainsTarget="true" />
+        <NavigationProperty Name="resource" Type="graph.governanceResource" />
         <NavigationProperty Name="roleDefinition" Type="graph.governanceRoleDefinition" ContainsTarget="true" />
       </EntityType>
       <EntityType Name="governanceSubject" BaseType="graph.entity">
@@ -71196,7 +71196,7 @@
           </Record>
         </Annotation>
       </Annotations>
-      <Annotations Target="microsoft.graph.application/createdOnBehalfOf">
+            <Annotations Target="microsoft.graph.application/createdOnBehalfOf">
         <Annotation Term="Org.OData.Capabilities.V1.NavigationRestrictions">
           <Record>
             <PropertyValue Property="Referenceable" Bool="true" />

From 0ef6d39431c8879ceecd941ee45d62b501ca7878 Mon Sep 17 00:00:00 2001
From: Irvine Sunday <40403681+irvinesunday@users.noreply.github.com>
Date: Wed, 9 Feb 2022 19:49:26 +0300
Subject: [PATCH 9/9] Update
 src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs

Co-authored-by: Vincent Biret <vibiret@microsoft.com>
---
 src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
index ce43513d..77324149 100644
--- a/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
+++ b/src/Microsoft.OpenApi.OData.Reader/Edm/ODataPathProvider.cs
@@ -337,7 +337,7 @@ private void RetrieveNavigationPropertyPaths(
 
             if (visitedNavigationProperties == null)
             {
-                visitedNavigationProperties = new Stack<string>();
+                visitedNavigationProperties = new ();
             }
                         
             var navPropFullyQualifiedName = $"{navigationProperty.DeclaringType.FullTypeName()}/{navigationProperty.Name}";