Remove referencing indexes when reconfiguring a property as a navigation

Fixes #29997
dotnet · Sep 10, 2024 · cd99bbf · cd99bbf
1 parent 36e4637
commit cd99bbf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs b/src/EFCore/Metadata/Internal/InternalTypeBaseBuilder.cs
@@ -774,7 +774,7 @@ public virtual void RemoveMembersInHierarchy(string propertyName, ConfigurationS
         {
             if (conflictingProperty.GetConfigurationSource() != ConfigurationSource.Explicit)
             {
-                conflictingProperty.DeclaringType.RemoveProperty(conflictingProperty);
+                conflictingProperty.DeclaringType.Builder.RemoveProperty(conflictingProperty, configurationSource);
             }
         }
 

diff --git a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.TestModel.cs b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.TestModel.cs
@@ -1189,6 +1189,7 @@ protected class OneToManyOwnedWithField
         public OneToManyOwnerWithField? OneToManyOwner { get; set; }
     }
 
+    [Index(nameof(OwnedDependent))]
     protected class OneToOneOwnerWithField
     {
         public int Id;
-Original file line number
+Diff line change
@@ Expand Up @@
             {
                 if (conflictingProperty.GetConfigurationSource() != ConfigurationSource.Explicit)
                 {
-                    conflictingProperty.DeclaringType.RemoveProperty(conflictingProperty);
+                    conflictingProperty.DeclaringType.Builder.RemoveProperty(conflictingProperty, configurationSource);
                 }
             }
@@ Expand Down @@