From f4cd44664517b5743eaaede67def1bf1ea913e6f Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Mon, 28 Sep 2020 11:31:40 -0700 Subject: [PATCH] Fix spelling --- .../Properties/RelationalStrings.Designer.cs | 2 +- .../Properties/RelationalStrings.resx | 2 +- src/EFCore/Properties/CoreStrings.Designer.cs | 14 +++++++------- src/EFCore/Properties/CoreStrings.resx | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs index d171697c573..1baf1b0ecb9 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs +++ b/src/EFCore.Relational/Properties/RelationalStrings.Designer.cs @@ -1955,7 +1955,7 @@ public static EventDefinition LogMigrationAttributeMissingWarning([NotNu } /// - /// Compiling a query which loads related collections for more than one collection navigation either via 'Include' or through projection but no 'QuerySplittingBehavior' has been configured. By default Entity Framework will use 'QuerySplittingBehavior.SingleQuery' which can potentially result in slow query performance. See https://go.microsoft.com/fwlink/?linkid=2134277 for more information. To identify the query that's triggering this warning call 'ConfigureWarnings(w => w.Throw(RelationalEventId.MultipleCollectionIncludeWarning)).' + /// Compiling a query which loads related collections for more than one collection navigation either via 'Include' or through projection but no 'QuerySplittingBehavior' has been configured. By default Entity Framework will use 'QuerySplittingBehavior.SingleQuery' which can potentially result in slow query performance. See https://go.microsoft.com/fwlink/?linkid=2134277 for more information. To identify the query that's triggering this warning call 'ConfigureWarnings(w => w.Throw(RelationalEventId.MultipleCollectionIncludeWarning))'. /// public static EventDefinition LogMultipleCollectionIncludeWarning([NotNull] IDiagnosticsLogger logger) { diff --git a/src/EFCore.Relational/Properties/RelationalStrings.resx b/src/EFCore.Relational/Properties/RelationalStrings.resx index 84f96332750..e2bdd4039b3 100644 --- a/src/EFCore.Relational/Properties/RelationalStrings.resx +++ b/src/EFCore.Relational/Properties/RelationalStrings.resx @@ -514,7 +514,7 @@ Warning RelationalEventId.MigrationAttributeMissingWarning string - Compiling a query which loads related collections for more than one collection navigation either via 'Include' or through projection but no 'QuerySplittingBehavior' has been configured. By default Entity Framework will use 'QuerySplittingBehavior.SingleQuery' which can potentially result in slow query performance. See https://go.microsoft.com/fwlink/?linkid=2134277 for more information. To identify the query that's triggering this warning call 'ConfigureWarnings(w => w.Throw(RelationalEventId.MultipleCollectionIncludeWarning)).' + Compiling a query which loads related collections for more than one collection navigation either via 'Include' or through projection but no 'QuerySplittingBehavior' has been configured. By default Entity Framework will use 'QuerySplittingBehavior.SingleQuery' which can potentially result in slow query performance. See https://go.microsoft.com/fwlink/?linkid=2134277 for more information. To identify the query that's triggering this warning call 'ConfigureWarnings(w => w.Throw(RelationalEventId.MultipleCollectionIncludeWarning))'. Warning RelationalEventId.MultipleCollectionIncludeWarning diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs index 0485adbdd65..0bb54c707b8 100644 --- a/src/EFCore/Properties/CoreStrings.Designer.cs +++ b/src/EFCore/Properties/CoreStrings.Designer.cs @@ -887,7 +887,7 @@ public static string FkAttributeOnNonUniquePrincipal([CanBeNull] object navigati navigation, principalType, dependentType); /// - /// The [ForeignKey] attributes on property '{property}' and navigation '{navigation}' in entity type '{entityType}' do not point at each other. Make sure the value of the [ForeignKey] attribute on the property mathes the navigation name, and the value of the [ForeignKey] attribute on the navigation mathes the foreign key property name or remove one of them. + /// The [ForeignKey] attributes on property '{property}' and navigation '{navigation}' in entity type '{entityType}' do not point at each other. Make sure the value of the [ForeignKey] attribute on the property matches the navigation name, and the value of the [ForeignKey] attribute on the navigation matches the foreign key property name or remove one of them. /// public static string FkAttributeOnPropertyNavigationMismatch([CanBeNull] object property, [CanBeNull] object navigation, [CanBeNull] object entityType) => string.Format( @@ -911,12 +911,12 @@ public static string ForeignKeyCountMismatch([CanBeNull] object foreignKeyProper foreignKeyProperties, dependentType, principalKeyProperties, principalType); /// - /// Cannot remove the foreign key {foreigKeyProperties} from entity type '{entityType}' because it is referenced by a skip navigation '{navigation}' on entity type '{navigationEntityType}'. All referencing skip navigation must be removed before the referenced foreign key can be removed. + /// Cannot remove the foreign key {foreignKeyProperties} from entity type '{entityType}' because it is referenced by a skip navigation '{navigation}' on entity type '{navigationEntityType}'. All referencing skip navigations must be removed before the referenced foreign key can be removed. /// - public static string ForeignKeyInUseSkipNavigation([CanBeNull] object foreigKeyProperties, [CanBeNull] object entityType, [CanBeNull] object navigation, [CanBeNull] object navigationEntityType) + public static string ForeignKeyInUseSkipNavigation([CanBeNull] object foreignKeyProperties, [CanBeNull] object entityType, [CanBeNull] object navigation, [CanBeNull] object navigationEntityType) => string.Format( - GetString("ForeignKeyInUseSkipNavigation", nameof(foreigKeyProperties), nameof(entityType), nameof(navigation), nameof(navigationEntityType)), - foreigKeyProperties, entityType, navigation, navigationEntityType); + GetString("ForeignKeyInUseSkipNavigation", nameof(foreignKeyProperties), nameof(entityType), nameof(navigation), nameof(navigationEntityType)), + foreignKeyProperties, entityType, navigation, navigationEntityType); /// /// The specified foreign key properties {foreignKeyProperties} are not declared on the entity type '{entityType}'. Ensure that foreign key properties are declared on the target entity type. @@ -1277,7 +1277,7 @@ public static string InvalidSetTypeOwned([CanBeNull] object typeName, [CanBeNull typeName, ownerType); /// - /// Cannot create a DbSet for '{typeName}' because it is mapped to multiple entity types with defininf navigations and should be accessed through the owning entities. + /// Cannot create a DbSet for '{typeName}' because it is mapped to multiple entity types with defining navigations and should be accessed through the owning entities. /// public static string InvalidSetTypeWeak([CanBeNull] object typeName) => string.Format( @@ -1547,7 +1547,7 @@ public static string NavigationArray([CanBeNull] object navigation, [CanBeNull] navigation, entityType, foundType); /// - /// The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' which does not implement ICollection<{targetType}>. Collection navigations must implement ICollection<> of the target type. + /// The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' which does not implement 'ICollection<{targetType}>'. Collection navigations must implement 'ICollection<>' of the target type. /// public static string NavigationBadType([CanBeNull] object navigation, [CanBeNull] object entityType, [CanBeNull] object foundType, [CanBeNull] object targetType) => string.Format( diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx index bfc869c2c33..6227993d7f1 100644 --- a/src/EFCore/Properties/CoreStrings.resx +++ b/src/EFCore/Properties/CoreStrings.resx @@ -448,7 +448,7 @@ The [ForeignKey] attribute for the navigation '{navigation}' cannot be specified on the entity type '{principalType}' since it represents a one-to-many relationship. Move the [ForeignKey] attribute to a property on '{dependentType}'. - The [ForeignKey] attributes on property '{property}' and navigation '{navigation}' in entity type '{entityType}' do not point at each other. Make sure the value of the [ForeignKey] attribute on the property mathes the navigation name, and the value of the [ForeignKey] attribute on the navigation mathes the foreign key property name or remove one of them. + The [ForeignKey] attributes on property '{property}' and navigation '{navigation}' in entity type '{entityType}' do not point at each other. Make sure the value of the [ForeignKey] attribute on the property matches the navigation name, and the value of the [ForeignKey] attribute on the navigation matches the foreign key property name or remove one of them. The [ForeignKey] attribute cannot be specified on the skip navigation '{entityType}'.'{navigation}'. Configure the foreign key properties in 'OnModelCreating' instead. @@ -457,7 +457,7 @@ The number of properties specified for the foreign key {foreignKeyProperties} on entity type '{dependentType}' does not match the number of properties in the principal key {principalKeyProperties} on entity type '{principalType}'. - Cannot remove the foreign key {foreigKeyProperties} from entity type '{entityType}' because it is referenced by a skip navigation '{navigation}' on entity type '{navigationEntityType}'. All referencing skip navigation must be removed before the referenced foreign key can be removed. + Cannot remove the foreign key {foreignKeyProperties} from entity type '{entityType}' because it is referenced by a skip navigation '{navigation}' on entity type '{navigationEntityType}'. All referencing skip navigations must be removed before the referenced foreign key can be removed. The specified foreign key properties {foreignKeyProperties} are not declared on the entity type '{entityType}'. Ensure that foreign key properties are declared on the target entity type. @@ -599,7 +599,7 @@ Cannot create a DbSet for '{typeName}' because it is configured as an owned entity type and must be accessed through its owning entity type '{ownerType}'. - Cannot create a DbSet for '{typeName}' because it is mapped to multiple entity types with defininf navigations and should be accessed through the owning entities. + Cannot create a DbSet for '{typeName}' because it is mapped to multiple entity types with defining navigations and should be accessed through the owning entities. Invalid {name}: {value} @@ -997,7 +997,7 @@ The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' which is an array type. Collection navigations cannot be arrays. - The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' which does not implement ICollection<{targetType}>. Collection navigations must implement ICollection<> of the target type. + The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' which does not implement 'ICollection<{targetType}>'. Collection navigations must implement 'ICollection<>' of the target type. The type of navigation '{1_entityType}.{0_navigation}' is '{foundType}' for which it was not possible to create a concrete instance. Either initialize the property before use, add a public parameterless constructor to the type, or use a type which can be assigned a HashSet<> or List<>.