Merge branch 'release/5.0-preview8' into main

dotnet · Jul 25, 2020 · 011d0dc · 011d0dc
2 parents ec01092 + ea25000
commit 011d0dc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 30 deletions.
diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs
diff --git a/src/EFCore/Metadata/INavigation.cs b/src/EFCore/Metadata/INavigation.cs
@@ -59,7 +59,7 @@ bool IsOnDependent
         {
             [DebuggerStepThrough]
             get => ForeignKey.DependentToPrincipal == this;
-        }            
+        }
 
         /// <summary>
         ///     Gets a value indicating whether the navigation property is a collection property.
@@ -76,6 +76,7 @@ bool INavigationBase.IsCollection
         /// </summary>
         /// <returns> The accessor. </returns>
         [DebuggerStepThrough]
-        IClrCollectionAccessor INavigationBase.GetCollectionAccessor() => new ClrCollectionAccessorFactory().Create(this);
+        IClrCollectionAccessor INavigationBase.GetCollectionAccessor()
+            => ((Navigation)this).CollectionAccessor;
     }
 }
diff --git a/src/EFCore/Metadata/ISkipNavigation.cs b/src/EFCore/Metadata/ISkipNavigation.cs
@@ -47,6 +47,6 @@ INavigationBase INavigationBase.Inverse
         /// </summary>
         /// <returns> The accessor. </returns>
         IClrCollectionAccessor INavigationBase.GetCollectionAccessor()
-            => new ClrCollectionAccessorFactory().Create(this);
+            => ((SkipNavigation)this).CollectionAccessor;
     }
 }
diff --git a/src/EFCore/Metadata/Internal/NavigationBaseExtensions.cs b/src/EFCore/Metadata/Internal/NavigationBaseExtensions.cs