Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

API Review fallout #21958

Merged
1 commit merged into from
Aug 6, 2020
Merged

API Review fallout #21958

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/EFCore.Design/Migrations/Design/CSharpSnapshotGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ protected virtual void GenerateEntityTypeAnnotations(
if (((bool?)isExcludedAnnotation.Value) == true)
{
stringBuilder
.Append(", t => t.IsExcludedFromMigrations()");
.Append(", t => t.ExcludeFromMigrations()");
}
annotations.Remove(isExcludedAnnotation.Name);
}
Expand Down
2 changes: 1 addition & 1 deletion src/EFCore.Relational/Metadata/Builders/TableBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public TableBuilder([NotNull] string name, [CanBeNull] string schema, [NotNull]
/// </summary>
/// <param name="excluded"> A value indicating whether the table should be managed by migrations. </param>
/// <returns> The same builder instance so that multiple calls can be chained. </returns>
public virtual TableBuilder IsExcludedFromMigrations(bool excluded = true)
public virtual TableBuilder ExcludeFromMigrations(bool excluded = true)
{
EntityType.SetIsTableExcludedFromMigrations(excluded);
return this;
Expand Down
4 changes: 2 additions & 2 deletions src/EFCore.Relational/Metadata/Builders/TableBuilder`.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public TableBuilder([NotNull] string name, [CanBeNull] string schema, [NotNull]
/// </summary>
/// <param name="excluded"> A value indicating whether the table should be managed by migrations. </param>
/// <returns> The same builder instance so that multiple calls can be chained. </returns>
public new virtual TableBuilder<TEntity> IsExcludedFromMigrations(bool excluded = true)
=> (TableBuilder<TEntity>)base.IsExcludedFromMigrations(excluded);
public new virtual TableBuilder<TEntity> ExcludeFromMigrations(bool excluded = true)
=> (TableBuilder<TEntity>)base.ExcludeFromMigrations(excluded);
}
}
40 changes: 20 additions & 20 deletions src/EFCore/Metadata/Builders/IConventionEntityTypeBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
/// </summary>
/// <param name="targetEntityType"> The entity type that this relationship targets. </param>
/// <param name="navigationToTargetName">
/// <param name="navigationName">
/// The name of the navigation property on this entity type that is part of the relationship.
/// </param>
/// <param name="setTargetAsPrincipal"> A value indicating whether the target entity type should be configured as the principal end. </param>
Expand All @@ -410,15 +410,15 @@ IConventionForeignKeyBuilder HasRelationship(
/// </returns>
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
[NotNull] string navigationToTargetName,
[NotNull] string navigationName,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);

/// <summary>
/// Configures a relationship between this and the target entity type.
/// </summary>
/// <param name="targetEntityType"> The entity type that this relationship targets. </param>
/// <param name="navigationToTarget"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigation"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="setTargetAsPrincipal"> A value indicating whether the target entity type should be configured as the principal end. </param>
/// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
/// <returns>
Expand All @@ -427,15 +427,15 @@ IConventionForeignKeyBuilder HasRelationship(
/// </returns>
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);

/// <summary>
/// Configures a relationship between this and the target entity type.
/// </summary>
/// <param name="targetEntityType"> The entity type that this relationship targets. </param>
/// <param name="navigationToTargetName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigationName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="inverseNavigationName">
/// The name of the navigation property on the target entity type that is part of the relationship. If <see langword="null" />
/// is specified, the relationship will be configured without a navigation property on the target end.
Expand All @@ -448,7 +448,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// </returns>
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
[NotNull] string navigationToTargetName,
[NotNull] string navigationName,
[CanBeNull] string inverseNavigationName,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
Expand All @@ -457,7 +457,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship between this and the target entity type.
/// </summary>
/// <param name="targetEntityType"> The entity type that this relationship targets. </param>
/// <param name="navigationToTarget"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigation"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="inverseNavigation">
/// The navigation property on the target entity type that is part of the relationship. If <see langword="null" />
/// is specified, the relationship will be configured without a navigation property on the target end.
Expand All @@ -470,7 +470,7 @@ IConventionForeignKeyBuilder HasRelationship(
/// </returns>
IConventionForeignKeyBuilder HasRelationship(
[NotNull] IConventionEntityType targetEntityType,
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
[CanBeNull] MemberInfo inverseNavigation,
bool setTargetAsPrincipal = false,
bool fromDataAnnotation = false);
Expand All @@ -479,34 +479,34 @@ IConventionForeignKeyBuilder HasRelationship(
/// Configures a relationship where the target entity is owned by (or part of) this entity.
/// </summary>
/// <param name="targetEntityType"> The type that this relationship targets. </param>
/// <param name="navigationToTargetName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigationName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
/// <returns> An object that can be used to configure the relationship. </returns>
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
[NotNull] string navigationToTargetName,
[NotNull] string navigationName,
bool fromDataAnnotation = false);

/// <summary>
/// Configures a relationship where the target entity is owned by (or part of) this entity.
/// </summary>
/// <param name="targetEntityType"> The type that this relationship targets. </param>
/// <param name="navigationToTarget"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigation"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
/// <returns>
/// An object that can be used to configure the relationship if it exists on the entity type,
/// <see langword="null" /> otherwise.
/// </returns>
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
bool fromDataAnnotation = false);

/// <summary>
/// Configures a relationship where the target entity is owned by (or part of) this entity.
/// </summary>
/// <param name="targetEntityType"> The type that this relationship targets. </param>
/// <param name="navigationToTargetName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigationName"> The name of the navigation property on this entity type that is part of the relationship. </param>
/// <param name="inverseNavigationName">
/// The name of the navigation property on the target entity type that is part of the relationship. If <see langword="null" />
/// is specified, the relationship will be configured without a navigation property on the target end.
Expand All @@ -518,15 +518,15 @@ IConventionForeignKeyBuilder HasOwnership(
/// </returns>
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
[NotNull] string navigationToTargetName,
[NotNull] string navigationName,
[CanBeNull] string inverseNavigationName,
bool fromDataAnnotation = false);

/// <summary>
/// Configures a relationship where the target entity is owned by (or part of) this entity.
/// </summary>
/// <param name="targetEntityType"> The type that this relationship targets. </param>
/// <param name="navigationToTarget"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigation"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="inverseNavigation">
/// The navigation property on the target entity type that is part of the relationship. If <see langword="null" />
/// is specified, the relationship will be configured without a navigation property on the target end.
Expand All @@ -538,7 +538,7 @@ IConventionForeignKeyBuilder HasOwnership(
/// </returns>
IConventionForeignKeyBuilder HasOwnership(
[NotNull] Type targetEntityType,
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
[CanBeNull] MemberInfo inverseNavigation,
bool fromDataAnnotation = false);

Expand Down Expand Up @@ -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.
/// </summary>
/// <param name="targetEntityType"> The entity type that this relationship targets. </param>
/// <param name="navigationToTarget"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="navigation"> The navigation property on this entity type that is part of the relationship. </param>
/// <param name="inverseNavigation">
/// The navigation property on the target entity type that is part of the relationship. If <see langword="null" />
/// is specified, the relationship will be configured without a navigation property on the target end.
Expand All @@ -646,7 +646,7 @@ bool CanAddNavigation([NotNull] string navigationName, bool fromDataAnnotation =
/// <see langword="null" /> otherwise.
/// </returns>
IConventionSkipNavigationBuilder HasSkipNavigation(
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
[NotNull] IConventionEntityType targetEntityType,
[NotNull] MemberInfo inverseNavigation,
bool? collections = null,
Expand All @@ -656,7 +656,7 @@ IConventionSkipNavigationBuilder HasSkipNavigation(
/// <summary>
/// Configures a skip navigation between this and the target entity type.
/// </summary>
/// <param name="navigationToTarget"> The navigation property. </param>
/// <param name="navigation"> The navigation property. </param>
/// <param name="targetEntityType"> The entity type that the navigation targets. </param>
/// <param name="collection"> Whether the navigation property is a collection property. </param>
/// <param name="onDependent">
Expand All @@ -668,7 +668,7 @@ IConventionSkipNavigationBuilder HasSkipNavigation(
/// <see langword="null" /> otherwise.
/// </returns>
IConventionSkipNavigationBuilder HasSkipNavigation(
[NotNull] MemberInfo navigationToTarget,
[NotNull] MemberInfo navigation,
[NotNull] IConventionEntityType targetEntityType,
bool? collection = null,
bool? onDependent = null,
Expand Down
Loading