diff --git a/src/EFCore.Relational/Metadata/Builders/TableBuilder.cs b/src/EFCore.Relational/Metadata/Builders/TableBuilder.cs
index 66ac541922a..4bd8fdcf2ef 100644
--- a/src/EFCore.Relational/Metadata/Builders/TableBuilder.cs
+++ b/src/EFCore.Relational/Metadata/Builders/TableBuilder.cs
@@ -35,7 +35,7 @@ public TableBuilder([NotNull] string name, [CanBeNull] string schema, [NotNull]
///
/// A value indicating whether the table should be managed by migrations.
/// The same builder instance so that multiple calls can be chained.
- public virtual TableBuilder IsExcludedFromMigrations(bool excluded = true)
+ public virtual TableBuilder ExcludeFromMigrations(bool excluded = true)
{
EntityType.SetIsTableExcludedFromMigrations(excluded);
return this;
diff --git a/src/EFCore.Relational/Metadata/Builders/TableBuilder`.cs b/src/EFCore.Relational/Metadata/Builders/TableBuilder`.cs
index 1a633a52295..3abfff21e74 100644
--- a/src/EFCore.Relational/Metadata/Builders/TableBuilder`.cs
+++ b/src/EFCore.Relational/Metadata/Builders/TableBuilder`.cs
@@ -33,7 +33,7 @@ public TableBuilder([NotNull] string name, [CanBeNull] string schema, [NotNull]
///
/// A value indicating whether the table should be managed by migrations.
/// The same builder instance so that multiple calls can be chained.
- public new virtual TableBuilder IsExcludedFromMigrations(bool excluded = true)
- => (TableBuilder)base.IsExcludedFromMigrations(excluded);
+ public new virtual TableBuilder ExcludeFromMigrations(bool excluded = true)
+ => (TableBuilder)base.ExcludeFromMigrations(excluded);
}
}
diff --git a/src/EFCore/Metadata/Builders/IConventionEntityTypeBuilder.cs b/src/EFCore/Metadata/Builders/IConventionEntityTypeBuilder.cs
index 29c197a565d..36357192663 100644
--- a/src/EFCore/Metadata/Builders/IConventionEntityTypeBuilder.cs
+++ b/src/EFCore/Metadata/Builders/IConventionEntityTypeBuilder.cs
@@ -399,7 +399,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
///
/// The entity type that this relationship targets.
- ///
+ ///
/// The name of the navigation property on this entity type that is part of the relationship.
///
/// A value indicating whether the target entity type should be configured as the principal end.
@@ -410,7 +410,7 @@ IConventionForeignKeyBuilder HasRelationship(
///
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
- [NotNull] string navigationToTargetName,
+ [NotNull] string navigationName,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
@@ -418,7 +418,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
///
/// The entity type that this relationship targets.
- /// The navigation property on this entity type that is part of the relationship.
+ /// The navigation property on this entity type that is part of the relationship.
/// A value indicating whether the target entity type should be configured as the principal end.
/// Indicates whether the configuration was specified using a data annotation.
///
@@ -427,7 +427,7 @@ IConventionForeignKeyBuilder HasRelationship(
///
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
@@ -435,7 +435,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
///
/// The entity type that this relationship targets.
- /// The name of the navigation property on this entity type that is part of the relationship.
+ /// The name of the navigation property on this entity type that is part of the relationship.
///
/// The name of the navigation property on the target entity type that is part of the relationship. If
/// is specified, the relationship will be configured without a navigation property on the target end.
@@ -448,7 +448,7 @@ IConventionForeignKeyBuilder HasRelationship(
///
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
- [NotNull] string navigationToTargetName,
+ [NotNull] string navigationName,
[CanBeNull] string inverseNavigationName,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
@@ -457,7 +457,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
///
/// The entity type that this relationship targets.
- /// The navigation property on this entity type that is part of the relationship.
+ /// The navigation property on this entity type that is part of the relationship.
///
/// The navigation property on the target entity type that is part of the relationship. If
/// is specified, the relationship will be configured without a navigation property on the target end.
@@ -470,7 +470,7 @@ IConventionForeignKeyBuilder HasRelationship(
///
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
[CanBeNull] MemberInfo inverseNavigation,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
@@ -479,19 +479,19 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship where the target entity is owned by (or part of) this entity.
///
/// The type that this relationship targets.
- /// The name of the navigation property on this entity type that is part of the relationship.
+ /// The name of the navigation property on this entity type that is part of the relationship.
/// Indicates whether the configuration was specified using a data annotation.
/// An object that can be used to configure the relationship.
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
- [NotNull] string navigationToTargetName,
+ [NotNull] string navigationName,
bool fromDataAnnotation = false);
///
/// Configures a relationship where the target entity is owned by (or part of) this entity.
///
/// The type that this relationship targets.
- /// The navigation property on this entity type that is part of the relationship.
+ /// The navigation property on this entity type that is part of the relationship.
/// Indicates whether the configuration was specified using a data annotation.
///
/// An object that can be used to configure the relationship if it exists on the entity type,
@@ -499,14 +499,14 @@ IConventionForeignKeyBuilder HasOwnership(
///
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
bool fromDataAnnotation = false);
///
/// Configures a relationship where the target entity is owned by (or part of) this entity.
///
/// The type that this relationship targets.
- /// The name of the navigation property on this entity type that is part of the relationship.
+ /// The name of the navigation property on this entity type that is part of the relationship.
///
/// The name of the navigation property on the target entity type that is part of the relationship. If
/// is specified, the relationship will be configured without a navigation property on the target end.
@@ -518,7 +518,7 @@ IConventionForeignKeyBuilder HasOwnership(
///
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
- [NotNull] string navigationToTargetName,
+ [NotNull] string navigationName,
[CanBeNull] string inverseNavigationName,
bool fromDataAnnotation = false);
@@ -526,7 +526,7 @@ IConventionForeignKeyBuilder HasOwnership(
/// Configures a relationship where the target entity is owned by (or part of) this entity.
///
/// The type that this relationship targets.
- /// The navigation property on this entity type that is part of the relationship.
+ /// The navigation property on this entity type that is part of the relationship.
///
/// The navigation property on the target entity type that is part of the relationship. If
/// is specified, the relationship will be configured without a navigation property on the target end.
@@ -538,7 +538,7 @@ IConventionForeignKeyBuilder HasOwnership(
///
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
[CanBeNull] MemberInfo inverseNavigation,
bool fromDataAnnotation = false);
@@ -631,7 +631,7 @@ bool CanAddNavigation([NotNull] string navigationName, bool fromDataAnnotation =
/// Configures a skip navigation and the inverse between this and the target entity type.
///
/// The entity type that this relationship targets.
- /// The navigation property on this entity type that is part of the relationship.
+ /// The navigation property on this entity type that is part of the relationship.
///
/// The navigation property on the target entity type that is part of the relationship. If
/// is specified, the relationship will be configured without a navigation property on the target end.
@@ -646,7 +646,7 @@ bool CanAddNavigation([NotNull] string navigationName, bool fromDataAnnotation =
/// otherwise.
///
IConventionSkipNavigationBuilder HasSkipNavigation(
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
[NotNull] IConventionEntityType targetEntityType,
[NotNull] MemberInfo inverseNavigation,
bool? collections = null,
@@ -656,7 +656,7 @@ IConventionSkipNavigationBuilder HasSkipNavigation(
///
/// Configures a skip navigation between this and the target entity type.
///
- /// The navigation property.
+ /// The navigation property.
/// The entity type that the navigation targets.
/// Whether the navigation property is a collection property.
///
@@ -668,7 +668,7 @@ IConventionSkipNavigationBuilder HasSkipNavigation(
/// otherwise.
///
IConventionSkipNavigationBuilder HasSkipNavigation(
- [NotNull] MemberInfo navigationToTarget,
+ [NotNull] MemberInfo navigation,
[NotNull] IConventionEntityType targetEntityType,
bool? collection = null,
bool? onDependent = null,
diff --git a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
index 117b3932c92..b870087fe82 100644
--- a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
+++ b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs
@@ -2599,13 +2599,13 @@ public virtual InternalForeignKeyBuilder HasRelationship(
///
public virtual InternalForeignKeyBuilder HasRelationship(
[NotNull] EntityType targetEntityType,
- [CanBeNull] string navigationToTargetName,
+ [CanBeNull] string navigationName,
[CanBeNull] string inverseNavigationName,
ConfigurationSource configurationSource,
bool setTargetAsPrincipal = false)
=> HasRelationship(
Check.NotNull(targetEntityType, nameof(targetEntityType)),
- MemberIdentity.Create(navigationToTargetName),
+ MemberIdentity.Create(navigationName),
MemberIdentity.Create(inverseNavigationName),
setTargetAsPrincipal ? true : (bool?)null,
configurationSource);
@@ -2618,34 +2618,34 @@ public virtual InternalForeignKeyBuilder HasRelationship(
///
public virtual InternalForeignKeyBuilder HasRelationship(
[NotNull] EntityType targetEntityType,
- [CanBeNull] MemberInfo navigationToTarget,
+ [CanBeNull] MemberInfo navigation,
[CanBeNull] MemberInfo inverseNavigation,
ConfigurationSource configurationSource,
bool setTargetAsPrincipal = false)
=> HasRelationship(
Check.NotNull(targetEntityType, nameof(targetEntityType)),
- MemberIdentity.Create(navigationToTarget),
+ MemberIdentity.Create(navigation),
MemberIdentity.Create(inverseNavigation),
setTargetAsPrincipal ? true : (bool?)null,
configurationSource);
private InternalForeignKeyBuilder HasRelationship(
EntityType targetEntityType,
- MemberIdentity? navigationToTarget,
+ MemberIdentity? navigation,
MemberIdentity? inverseNavigation,
bool? setTargetAsPrincipal,
ConfigurationSource configurationSource,
bool? required = null)
{
Check.DebugAssert(
- navigationToTarget != null || inverseNavigation != null,
- "navigationToTarget == null and inverseNavigation == null");
+ navigation != null || inverseNavigation != null,
+ "navigation == null and inverseNavigation == null");
Check.DebugAssert(
setTargetAsPrincipal != null || required == null,
"required should only be set if principal end is known");
- var navigationProperty = navigationToTarget?.MemberInfo;
+ var navigationProperty = navigation?.MemberInfo;
if (setTargetAsPrincipal == false
|| (inverseNavigation == null
&& navigationProperty?.GetMemberType().IsAssignableFrom(
@@ -2653,13 +2653,13 @@ private InternalForeignKeyBuilder HasRelationship(
{
// Target is expected to be dependent or only one nav specified and it can't be the nav to principal
return targetEntityType.Builder.HasRelationship(
- Metadata, null, navigationToTarget, !setTargetAsPrincipal, configurationSource, required);
+ Metadata, null, navigation, !setTargetAsPrincipal, configurationSource, required);
}
var existingRelationship = InternalForeignKeyBuilder.FindCurrentForeignKeyBuilder(
targetEntityType,
Metadata,
- navigationToTarget,
+ navigation,
inverseNavigation,
dependentProperties: null,
principalProperties: null);
@@ -2669,9 +2669,9 @@ private InternalForeignKeyBuilder HasRelationship(
// The dependent and principal sides could be in the same hierarchy so we need to use the navigations to determine
// the expected principal side.
// And since both sides are in the same hierarchy different navigations must have different names.
- if (navigationToTarget != null)
+ if (navigation != null)
{
- if (navigationToTarget.Value.Name == existingRelationship.Metadata.DependentToPrincipal?.Name)
+ if (navigation.Value.Name == existingRelationship.Metadata.DependentToPrincipal?.Name)
{
existingRelationship.Metadata.UpdateDependentToPrincipalConfigurationSource(configurationSource);
}
@@ -2684,9 +2684,9 @@ private InternalForeignKeyBuilder HasRelationship(
existingRelationship.Metadata.UpdatePrincipalToDependentConfigurationSource(configurationSource);
}
- if (navigationToTarget.Value.Name != null)
+ if (navigation.Value.Name != null)
{
- Metadata.RemoveIgnored(navigationToTarget.Value.Name);
+ Metadata.RemoveIgnored(navigation.Value.Name);
}
}
@@ -2739,22 +2739,22 @@ private InternalForeignKeyBuilder HasRelationship(
Metadata,
targetEntityType,
inverseNavigation,
- navigationToTarget,
+ navigation,
dependentProperties: null,
principalProperties: null);
if (existingRelationship != null)
{
// Since the existing relationship didn't match the first case then the dependent and principal sides
// are not in the same hierarchy therefore we don't need to check existing navigations
- if (navigationToTarget != null)
+ if (navigation != null)
{
- Check.DebugAssert(navigationToTarget.Value.Name == existingRelationship.Metadata.PrincipalToDependent?.Name,
- $"Expected {navigationToTarget.Value.Name}, found {existingRelationship.Metadata.PrincipalToDependent?.Name}");
+ Check.DebugAssert(navigation.Value.Name == existingRelationship.Metadata.PrincipalToDependent?.Name,
+ $"Expected {navigation.Value.Name}, found {existingRelationship.Metadata.PrincipalToDependent?.Name}");
existingRelationship.Metadata.UpdatePrincipalToDependentConfigurationSource(configurationSource);
- if (navigationToTarget.Value.Name != null)
+ if (navigation.Value.Name != null)
{
- Metadata.RemoveIgnored(navigationToTarget.Value.Name);
+ Metadata.RemoveIgnored(navigation.Value.Name);
}
}
@@ -2802,9 +2802,9 @@ private InternalForeignKeyBuilder HasRelationship(
}
else
{
- var navigation = navigationToTarget;
+ var navigationToTarget = navigation;
navigationToTarget = inverseNavigation;
- inverseNavigation = navigation;
+ inverseNavigation = navigationToTarget;
navigationProperty = navigationToTarget?.MemberInfo;
@@ -2840,11 +2840,11 @@ private InternalForeignKeyBuilder HasRelationship(
pointsToPrincipal: true,
configurationSource)
: relationship.HasNavigation(
- navigationToTarget.Value.Name,
+ navigation.Value.Name,
pointsToPrincipal: true,
configurationSource);
}
- else if (navigationToTarget == null)
+ else if (navigation == null)
{
relationship = inverseProperty != null
? relationship.HasNavigation(
@@ -2860,7 +2860,7 @@ private InternalForeignKeyBuilder HasRelationship(
{
relationship = navigationProperty != null || inverseProperty != null
? relationship.HasNavigations(navigationProperty, inverseProperty, configurationSource)
- : relationship.HasNavigations(navigationToTarget.Value.Name, inverseNavigation.Value.Name, configurationSource);
+ : relationship.HasNavigations(navigation.Value.Name, inverseNavigation.Value.Name, configurationSource);
}
if (relationship != null)
@@ -2870,14 +2870,14 @@ private InternalForeignKeyBuilder HasRelationship(
}
if (relationship != null
- && ((navigationToTarget != null
- && relationship.Metadata.DependentToPrincipal?.Name != navigationToTarget.Value.Name)
+ && ((navigation != null
+ && relationship.Metadata.DependentToPrincipal?.Name != navigation.Value.Name)
|| (inverseNavigation != null
&& relationship.Metadata.PrincipalToDependent?.Name != inverseNavigation.Value.Name))
&& ((inverseNavigation != null
&& relationship.Metadata.DependentToPrincipal?.Name != inverseNavigation.Value.Name)
- || (navigationToTarget != null
- && relationship.Metadata.PrincipalToDependent?.Name != navigationToTarget.Value.Name)))
+ || (navigation != null
+ && relationship.Metadata.PrincipalToDependent?.Name != navigation.Value.Name)))
{
relationship = null;
}
@@ -3222,7 +3222,7 @@ private InternalForeignKeyBuilder HasOwnership(
relationship = ownedEntityType.HasRelationship(
targetEntityType: principalBuilder.Metadata,
- navigationToTarget: inverse,
+ navigation: inverse,
inverseNavigation: navigation,
setTargetAsPrincipal: true,
configurationSource,
@@ -3563,7 +3563,7 @@ private ForeignKey SetOrAddForeignKey(
/// doing so can result in application failures when updating to a new Entity Framework Core release.
///
public virtual InternalSkipNavigationBuilder HasSkipNavigation(
- MemberIdentity navigationToTarget,
+ MemberIdentity navigation,
[NotNull] EntityType targetEntityType,
MemberIdentity inverseNavigation,
ConfigurationSource configurationSource,
@@ -3571,7 +3571,7 @@ public virtual InternalSkipNavigationBuilder HasSkipNavigation(
bool? onDependent = null)
{
var skipNavigationBuilder = HasSkipNavigation(
- navigationToTarget, targetEntityType, configurationSource, collections, onDependent);
+ navigation, targetEntityType, configurationSource, collections, onDependent);
if (skipNavigationBuilder == null)
{
return null;
@@ -4720,10 +4720,10 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
- IConventionEntityType targetEntityType, string navigationToTargetName, bool setTargetAsPrincipal, bool fromDataAnnotation)
+ IConventionEntityType targetEntityType, string navigationName, bool setTargetAsPrincipal, bool fromDataAnnotation)
=> HasRelationship(
(EntityType)targetEntityType,
- navigationToTargetName,
+ navigationName,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
setTargetAsPrincipal ? true : (bool?)null);
@@ -4735,10 +4735,10 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
- IConventionEntityType targetEntityType, MemberInfo navigationToTarget, bool setTargetAsPrincipal, bool fromDataAnnotation)
+ IConventionEntityType targetEntityType, MemberInfo navigation, bool setTargetAsPrincipal, bool fromDataAnnotation)
=> HasRelationship(
(EntityType)targetEntityType,
- navigationToTarget,
+ navigation,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
setTargetAsPrincipal ? true : (bool?)null);
@@ -4751,13 +4751,13 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
IConventionEntityType targetEntityType,
- string navigationToTargetName,
+ string navigationName,
string inverseNavigationName,
bool setTargetAsPrincipal,
bool fromDataAnnotation)
=> HasRelationship(
(EntityType)targetEntityType,
- navigationToTargetName, inverseNavigationName,
+ navigationName, inverseNavigationName,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
setTargetAsPrincipal);
@@ -4770,27 +4770,27 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasRelationship(
IConventionEntityType targetEntityType,
- MemberInfo navigationToTarget,
+ MemberInfo navigation,
MemberInfo inverseNavigation,
bool setTargetAsPrincipal,
bool fromDataAnnotation)
=> HasRelationship(
(EntityType)targetEntityType,
- navigationToTarget, inverseNavigation,
+ navigation, inverseNavigation,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
setTargetAsPrincipal);
///
[DebuggerStepThrough]
IConventionSkipNavigationBuilder IConventionEntityTypeBuilder.HasSkipNavigation(
- MemberInfo navigationToTarget,
+ MemberInfo navigation,
IConventionEntityType targetEntityType,
MemberInfo inverseNavigation,
bool? collections,
bool? onDependent,
bool fromDataAnnotation)
=> HasSkipNavigation(
- MemberIdentity.Create(navigationToTarget),
+ MemberIdentity.Create(navigation),
(EntityType)targetEntityType,
MemberIdentity.Create(inverseNavigation),
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
@@ -4805,9 +4805,9 @@ IConventionSkipNavigationBuilder IConventionEntityTypeBuilder.HasSkipNavigation(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
- Type targetEntityType, string navigationToTargetName, bool fromDataAnnotation)
+ Type targetEntityType, string navigationName, bool fromDataAnnotation)
=> HasOwnership(
- targetEntityType, navigationToTargetName,
+ targetEntityType, navigationName,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
@@ -4818,9 +4818,9 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
- Type targetEntityType, MemberInfo navigationToTarget, bool fromDataAnnotation)
+ Type targetEntityType, MemberInfo navigation, bool fromDataAnnotation)
=> HasOwnership(
- targetEntityType, navigationToTarget,
+ targetEntityType, navigation,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
@@ -4831,9 +4831,9 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
- Type targetEntityType, string navigationToTargetName, string inversePropertyName, bool fromDataAnnotation)
+ Type targetEntityType, string navigationName, string inversePropertyName, bool fromDataAnnotation)
=> HasOwnership(
- targetEntityType, navigationToTargetName, inversePropertyName,
+ targetEntityType, navigationName, inversePropertyName,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
@@ -4844,9 +4844,9 @@ IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
///
[DebuggerStepThrough]
IConventionForeignKeyBuilder IConventionEntityTypeBuilder.HasOwnership(
- Type targetEntityType, MemberInfo navigationToTarget, MemberInfo inverseProperty, bool fromDataAnnotation)
+ Type targetEntityType, MemberInfo navigation, MemberInfo inverseProperty, bool fromDataAnnotation)
=> HasOwnership(
- targetEntityType, navigationToTarget, inverseProperty,
+ targetEntityType, navigation, inverseProperty,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention);
///
@@ -4923,13 +4923,13 @@ bool IConventionEntityTypeBuilder.CanHaveNavigationBase(string navigationBaseNam
///
[DebuggerStepThrough]
IConventionSkipNavigationBuilder IConventionEntityTypeBuilder.HasSkipNavigation(
- MemberInfo navigationToTarget,
+ MemberInfo navigation,
IConventionEntityType targetEntityType,
bool? collection,
bool? onDependent,
bool fromDataAnnotation)
=> HasSkipNavigation(
- MemberIdentity.Create(navigationToTarget),
+ MemberIdentity.Create(navigation),
(EntityType)targetEntityType,
fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention,
collection,
diff --git a/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs b/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs
index 74f1532581b..21f30b61494 100644
--- a/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs
+++ b/test/EFCore.Design.Tests/Migrations/ModelSnapshotSqlServerTest.cs
@@ -433,7 +433,7 @@ public virtual void Entities_are_stored_in_model_snapshot_for_TPT_with_one_exclu
builder =>
{
builder.Entity()
- .ToTable("DerivedEntity", "foo", t => t.IsExcludedFromMigrations());
+ .ToTable("DerivedEntity", "foo", t => t.ExcludeFromMigrations());
builder.Entity();
},
AddBoilerPlate(
diff --git a/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs b/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
index 5e8cbe68fa4..540fbb853d7 100644
--- a/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
+++ b/test/EFCore.Relational.Tests/Infrastructure/RelationalModelValidatorTest.cs
@@ -411,8 +411,8 @@ public virtual void Passes_for_compatible_excluded_shared_table_inverted()
var modelBuilder = CreateConventionalModelBuilder();
modelBuilder.Entity().HasOne().WithOne().HasPrincipalKey(a => a.Id).HasForeignKey(b => b.Id).IsRequired();
- modelBuilder.Entity().ToTable("Table", t => t.IsExcludedFromMigrations());
- modelBuilder.Entity().ToTable("Table", t => t.IsExcludedFromMigrations());
+ modelBuilder.Entity().ToTable("Table", t => t.ExcludeFromMigrations());
+ modelBuilder.Entity().ToTable("Table", t => t.ExcludeFromMigrations());
Validate(modelBuilder.Model);
}
@@ -423,7 +423,7 @@ public virtual void Passes_for_compatible_excluded_shared_table_owned()
var modelBuilder = CreateConventionalModelBuilder();
modelBuilder.Entity().OwnsOne(b => b.A);
- modelBuilder.Entity().ToTable("Table", t => t.IsExcludedFromMigrations());
+ modelBuilder.Entity().ToTable("Table", t => t.ExcludeFromMigrations());
var model = Validate(modelBuilder.Model);
@@ -437,7 +437,7 @@ public virtual void Passes_for_compatible_excluded_table_derived()
{
var modelBuilder = CreateConventionalModelBuilder();
- modelBuilder.Entity().ToTable("Table", t => t.IsExcludedFromMigrations());
+ modelBuilder.Entity().ToTable("Table", t => t.ExcludeFromMigrations());
modelBuilder.Entity();
var model = Validate(modelBuilder.Model);
@@ -453,7 +453,7 @@ public virtual void Detect_partially_excluded_shared_table()
var modelBuilder = CreateConventionalModelBuilder();
modelBuilder.Entity().HasOne().WithOne().HasPrincipalKey(a => a.Id).HasForeignKey(b => b.Id).IsRequired();
- modelBuilder.Entity().ToTable("Table", t => t.IsExcludedFromMigrations());
+ modelBuilder.Entity().ToTable("Table", t => t.ExcludeFromMigrations());
modelBuilder.Entity().ToTable("Table");
VerifyError(