Check declaring object status in IsInModel

src/EFCore.Relational/Metadata/Internal/CheckConstraint.cs

@@ -241,7 +241,8 @@ public virtual InternalCheckConstraintBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && ((IConventionAnnotatable)EntityType).IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/EntityTypeMappingFragment.cs

@@ -57,7 +57,8 @@ public virtual InternalEntityTypeMappingFragmentBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && ((IConventionAnnotatable)EntityType).IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/RelationalPropertyOverrides.cs

@@ -83,7 +83,8 @@ public virtual InternalRelationalPropertyOverridesBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && ((IConventionAnnotatable)Property).IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/StoredProcedureParameter.cs

@@ -68,7 +68,8 @@ public virtual InternalStoredProcedureParameterBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && StoredProcedure.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore.Relational/Metadata/Internal/StoredProcedureResultColumn.cs

@@ -56,7 +56,8 @@ public virtual InternalStoredProcedureResultColumnBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && StoredProcedure.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Conventions/ModelCleanupConvention.cs

@@ -35,7 +35,6 @@ public virtual void ProcessForeignKeyRemoved(
     {
         var principalKey = foreignKey.PrincipalKey;
         if (principalKey.IsInModel
-            && principalKey.DeclaringEntityType.IsInModel
             && !principalKey.IsPrimaryKey()
             && !principalKey.GetReferencingForeignKeys().Any())
         {

src/EFCore/Metadata/Internal/ForeignKey.cs

@@ -118,7 +118,8 @@ public virtual InternalForeignKeyBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/Index.cs

@@ -103,7 +103,8 @@ public virtual InternalIndexBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/Key.cs

@@ -76,7 +76,8 @@ public virtual InternalKeyBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/Navigation.cs

@@ -76,7 +76,8 @@ public virtual InternalNavigationBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && ForeignKey.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/Property.cs

@@ -97,7 +97,8 @@ public virtual InternalPropertyBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/ServiceProperty.cs

@@ -85,7 +85,8 @@ public virtual InternalServicePropertyBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/SkipNavigation.cs

@@ -91,7 +91,8 @@ public virtual InternalSkipNavigationBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && DeclaringEntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

src/EFCore/Metadata/Internal/Trigger.cs

@@ -52,7 +52,8 @@ public virtual InternalTriggerBuilder Builder
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
     public virtual bool IsInModel
-        => _builder is not null;
+        => _builder is not null
+            && EntityType.IsInModel;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to