Scaffolding fails for a self-referencing many-to-many join table when both FKs yield the same navigation name

src/EFCore.Design/Scaffolding/Internal/RelationalScaffoldingModelFactory.cs

@@ -707,6 +707,10 @@ protected virtual ModelBuilder VisitForeignKeys(
                         singularizePluralizer: null,
                         uniquifier: NavigationUniquifier);
 
+                // The skip navigation is only added to the model below, so make the name visible to the right-hand
+                // side, which otherwise generates the same name when the join table references a single entity type.
+                leftExistingIdentifiers.Add(leftNavigationPropertyName);
+
                 var rightExistingIdentifiers = ExistingIdentifiers(rightEntityType);
                 var rightNavigationPropertyCandidateName =
                     _candidateNamingService.GetDependentEndCandidateNavigationPropertyName(fks[0]);

test/EFCore.Design.Tests/Scaffolding/Internal/RelationalScaffoldingModelFactoryTest.cs

@@ -2681,6 +2681,59 @@ public void Scaffold_skip_navigation_for_many_to_many_join_table_self_ref()
             });
     }
 
+    [Fact]
+    public void Scaffold_skip_navigation_for_many_to_many_join_table_self_ref_with_colliding_navigation_names()
+    {
+        var database = new DatabaseModel
+        {
+            Tables =
+            {
+                new DatabaseTable
+                {
+                    Name = "Products",
+                    Columns = { new DatabaseColumn { Name = "Id", StoreType = "int" } },
+                    PrimaryKey = new DatabasePrimaryKey { Columns = { new DatabaseColumnRef("Id") } }
+                },
+                new DatabaseTable
+                {
+                    Name = "RelatedProducts",
+                    Columns =
+                    {
+                        new DatabaseColumn { Name = "Product_Id", StoreType = "int" },
+                        new DatabaseColumn { Name = "ProductId", StoreType = "int" }
+                    },
+                    PrimaryKey = new DatabasePrimaryKey
+                    {
+                        Columns = { new DatabaseColumnRef("Product_Id"), new DatabaseColumnRef("ProductId") }
+                    },
+                    ForeignKeys =
+                    {
+                        new DatabaseForeignKey
+                        {
+                            Columns = { new DatabaseColumnRef("Product_Id") },
+                            PrincipalColumns = { new DatabaseColumnRef("Id") },
+                            PrincipalTable = new DatabaseTableRef("Products"),
+                        },
+                        new DatabaseForeignKey
+                        {
+                            Columns = { new DatabaseColumnRef("ProductId") },
+                            PrincipalColumns = { new DatabaseColumnRef("Id") },
+                            PrincipalTable = new DatabaseTableRef("Products"),
+                        }
+                    }
+                }
+            }
+        };
+
+        var model = _factory.Create(database, new ModelReverseEngineerOptions());
+
+        var product = model.GetEntityTypes().Single(e => e.Name == "Product");
+        var skipNavigationNames = product.GetSkipNavigations().Select(n => n.Name).ToList();
+
+        Assert.Equal(2, skipNavigationNames.Count);
+        Assert.Equal(skipNavigationNames.Count, skipNavigationNames.Distinct().Count());
+    }
+
     [Fact]
     public void Scaffold_skip_navigation_for_many_to_many_join_table_composite_fk()
     {