@tsonic/efcore 10.0.2 → 10.0.3

package/Microsoft.EntityFrameworkCore.Metadata.Conventions/internal/index.d.ts

@@ -571,18 +571,12 @@ export interface ITypeIgnoredConvention$instance extends IConvention$instance {}
 
 export type ITypeIgnoredConvention = ITypeIgnoredConvention$instance;
 
-export abstract class BackingFieldAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: BackingFieldAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: BackingFieldAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface BackingFieldAttributeConvention$instance extends BackingFieldAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<BackingFieldAttribute>, IConvention {
+export interface BackingFieldAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<BackingFieldAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessComplexPropertyFieldChanged(propertyBuilder: IConventionComplexPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: BackingFieldAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: BackingFieldAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -602,12 +596,8 @@ export interface __BackingFieldAttributeConvention$views {
 export type BackingFieldAttributeConvention = BackingFieldAttributeConvention$instance & __BackingFieldAttributeConvention$views;
 
 
-export abstract class BackingFieldConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface BackingFieldConvention$instance extends BackingFieldConvention$protected, IConvention {
+export interface BackingFieldConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, context: IConventionContext_1<IConventionNavigationBuilder>): void;
@@ -634,12 +624,8 @@ export interface BackingFieldConvention$instance extends IComplexPropertyAddedCo
 export type BackingFieldConvention = BackingFieldConvention$instance & __BackingFieldConvention$views;
 
 
-export abstract class BaseTypeDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface BaseTypeDiscoveryConvention$instance extends BaseTypeDiscoveryConvention$protected, IConvention {
+export interface BaseTypeDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessForeignKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, foreignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
 }
@@ -660,13 +646,9 @@ export interface BaseTypeDiscoveryConvention$instance extends IEntityTypeAddedCo
 export type BaseTypeDiscoveryConvention = BaseTypeDiscoveryConvention$instance & __BaseTypeDiscoveryConvention$views;
 
 
-export abstract class CascadeDeleteConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected GetTargetDeleteBehavior(foreignKey: IConventionForeignKey): DeleteBehavior;
-}
-
-
-export interface CascadeDeleteConvention$instance extends CascadeDeleteConvention$protected, IConvention {
+export interface CascadeDeleteConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    GetTargetDeleteBehavior(foreignKey: IConventionForeignKey): DeleteBehavior;
     ProcessForeignKeyAdded(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
     ProcessForeignKeyRequirednessChanged(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<Nullable<System_Internal.Boolean>>): void;
 }
@@ -687,12 +669,8 @@ export interface CascadeDeleteConvention$instance extends IForeignKeyAddedConven
 export type CascadeDeleteConvention = CascadeDeleteConvention$instance & __CascadeDeleteConvention$views;
 
 
-export abstract class ChangeTrackingStrategyConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ChangeTrackingStrategyConvention$instance extends ChangeTrackingStrategyConvention$protected, IConvention {
+export interface ChangeTrackingStrategyConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -711,13 +689,9 @@ export interface ChangeTrackingStrategyConvention$instance extends IModelFinaliz
 export type ChangeTrackingStrategyConvention = ChangeTrackingStrategyConvention$instance & __ChangeTrackingStrategyConvention$views;
 
 
-export abstract class CheckConstraintConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface CheckConstraintConvention$instance extends CheckConstraintConvention$protected, IConvention {
+export interface CheckConstraintConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
 }
@@ -738,16 +712,12 @@ export interface CheckConstraintConvention$instance extends IEntityTypeAddedConv
 export type CheckConstraintConvention = CheckConstraintConvention$instance & __CheckConstraintConvention$views;
 
 
-export abstract class ComplexPropertyDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly UseAttributes: boolean;
-    protected DiscoverComplexProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
-    protected GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
-    protected IsCandidateComplexProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, targetClrType: Type, isCollection: boolean): boolean;
-}
-
-
-export interface ComplexPropertyDiscoveryConvention$instance extends ComplexPropertyDiscoveryConvention$protected, IConvention {
+export interface ComplexPropertyDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly UseAttributes: boolean;
+    DiscoverComplexProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
+    GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
+    IsCandidateComplexProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, targetClrType: Type, isCollection: boolean): boolean;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -786,13 +756,7 @@ export interface ComplexPropertyDiscoveryConvention$instance extends IComplexPro
 export type ComplexPropertyDiscoveryConvention = ComplexPropertyDiscoveryConvention$instance & __ComplexPropertyDiscoveryConvention$views;
 
 
-export abstract class ComplexTypeAttributeConvention$protected {
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: ComplexTypeAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface ComplexTypeAttributeConvention$instance extends ComplexTypeAttributeConvention$protected, TypeAttributeConventionBase_1$instance<ComplexTypeAttribute>, IConvention {
+export interface ComplexTypeAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<ComplexTypeAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
@@ -812,15 +776,9 @@ export interface __ComplexTypeAttributeConvention$views {
 export type ComplexTypeAttributeConvention = ComplexTypeAttributeConvention$instance & __ComplexTypeAttributeConvention$views;
 
 
-export abstract class ConcurrencyCheckAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: ConcurrencyCheckAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface ConcurrencyCheckAttributeConvention$instance extends ConcurrencyCheckAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<ConcurrencyCheckAttribute>, IConvention {
+export interface ConcurrencyCheckAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<ConcurrencyCheckAttribute>, IConvention {
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: ConcurrencyCheckAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -838,12 +796,8 @@ export interface __ConcurrencyCheckAttributeConvention$views {
 export type ConcurrencyCheckAttributeConvention = ConcurrencyCheckAttributeConvention$instance & __ConcurrencyCheckAttributeConvention$views;
 
 
-export abstract class ConstructorBindingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ConstructorBindingConvention$instance extends ConstructorBindingConvention$protected, IConvention {
+export interface ConstructorBindingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -937,15 +891,9 @@ export const ConventionSet: {
 
 export type ConventionSet = ConventionSet$instance;
 
-export abstract class DatabaseGeneratedAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: DatabaseGeneratedAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface DatabaseGeneratedAttributeConvention$instance extends DatabaseGeneratedAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<DatabaseGeneratedAttribute>, IConvention {
+export interface DatabaseGeneratedAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<DatabaseGeneratedAttribute>, IConvention {
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: DatabaseGeneratedAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -963,12 +911,8 @@ export interface __DatabaseGeneratedAttributeConvention$views {
 export type DatabaseGeneratedAttributeConvention = DatabaseGeneratedAttributeConvention$instance & __DatabaseGeneratedAttributeConvention$views;
 
 
-export abstract class DbSetFindingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface DbSetFindingConvention$instance extends DbSetFindingConvention$protected, IConvention {
+export interface DbSetFindingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessModelInitialized(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -987,20 +931,14 @@ export interface DbSetFindingConvention$instance extends IModelInitializedConven
 export type DbSetFindingConvention = DbSetFindingConvention$instance & __DbSetFindingConvention$views;
 
 
-export abstract class DeleteBehaviorAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: DeleteBehaviorAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: DeleteBehaviorAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface DeleteBehaviorAttributeConvention$instance extends DeleteBehaviorAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<DeleteBehaviorAttribute>, IConvention {
+export interface DeleteBehaviorAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<DeleteBehaviorAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessForeignKeyPrincipalEndChanged(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, context: IConventionContext_1<IConventionNavigationBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: DeleteBehaviorAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: DeleteBehaviorAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -1024,17 +962,13 @@ export interface DeleteBehaviorAttributeConvention$instance extends IForeignKeyP
 export type DeleteBehaviorAttributeConvention = DeleteBehaviorAttributeConvention$instance & __DeleteBehaviorAttributeConvention$views;
 
 
-export abstract class DiscriminatorConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected SetDefaultDiscriminatorValue(complexType: IConventionComplexType, discriminatorBuilder: IConventionComplexTypeDiscriminatorBuilder): void;
-    protected SetDefaultDiscriminatorValues(entityTypes: IEnumerable<IConventionEntityType>, discriminatorBuilder: IConventionDiscriminatorBuilder): void;
-}
-
-
-export interface DiscriminatorConvention$instance extends DiscriminatorConvention$protected, IConvention {
+export interface DiscriminatorConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessDiscriminatorPropertySet(structuralTypeBuilder: IConventionTypeBaseBuilder, name: string, context: IConventionContext_1<System_Internal.String>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessEntityTypeRemoved(modelBuilder: IConventionModelBuilder, entityType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
+    SetDefaultDiscriminatorValue(complexType: IConventionComplexType, discriminatorBuilder: IConventionComplexTypeDiscriminatorBuilder): void;
+    SetDefaultDiscriminatorValues(entityTypes: IEnumerable<IConventionEntityType>, discriminatorBuilder: IConventionDiscriminatorBuilder): void;
 }
 
 
@@ -1054,13 +988,9 @@ export interface DiscriminatorConvention$instance extends IDiscriminatorProperty
 export type DiscriminatorConvention = DiscriminatorConvention$instance & __DiscriminatorConvention$views;
 
 
-export abstract class DiscriminatorLengthConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface DiscriminatorLengthConvention$instance extends DiscriminatorLengthConvention$protected, IConvention {
+export interface DiscriminatorLengthConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -1079,12 +1009,8 @@ export interface DiscriminatorLengthConvention$instance extends IModelFinalizing
 export type DiscriminatorLengthConvention = DiscriminatorLengthConvention$instance & __DiscriminatorLengthConvention$views;
 
 
-export abstract class ElementMappingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ElementMappingConvention$instance extends ElementMappingConvention$protected, IConvention {
+export interface ElementMappingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -1103,12 +1029,8 @@ export interface ElementMappingConvention$instance extends IModelFinalizingConve
 export type ElementMappingConvention = ElementMappingConvention$instance & __ElementMappingConvention$views;
 
 
-export abstract class ElementTypeChangedConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ElementTypeChangedConvention$instance extends ElementTypeChangedConvention$protected, IConvention {
+export interface ElementTypeChangedConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessForeignKeyAdded(foreignKeyBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
     ProcessForeignKeyPropertiesChanged(relationshipBuilder: IConventionForeignKeyBuilder, oldDependentProperties: IReadOnlyList<IConventionProperty>, oldPrincipalKey: IConventionKey, context: IConventionContext_1<IReadOnlyList<IConventionProperty>>): void;
     ProcessPropertyElementTypeChanged(propertyBuilder: IConventionPropertyBuilder, newElementType: IElementType, oldElementType: IElementType, context: IConventionContext_1<IElementType>): void;
@@ -1131,13 +1053,9 @@ export interface ElementTypeChangedConvention$instance extends IForeignKeyAddedC
 export type ElementTypeChangedConvention = ElementTypeChangedConvention$instance & __ElementTypeChangedConvention$views;
 
 
-export abstract class EntitySplittingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface EntitySplittingConvention$instance extends EntitySplittingConvention$protected, IConvention {
+export interface EntitySplittingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
@@ -1158,16 +1076,9 @@ export interface EntitySplittingConvention$instance extends IEntityTypeAddedConv
 export type EntitySplittingConvention = EntitySplittingConvention$instance & __EntitySplittingConvention$views;
 
 
-export abstract class EntityTypeConfigurationAttributeConvention$protected {
-    protected ProcessComplexTypeAdded2(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: EntityTypeConfigurationAttribute, context: IConventionContext): void;
-    protected ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: unknown, context: IConventionContext): void;
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: EntityTypeConfigurationAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface EntityTypeConfigurationAttributeConvention$instance extends EntityTypeConfigurationAttributeConvention$protected, TypeAttributeConventionBase_1$instance<EntityTypeConfigurationAttribute>, IConvention {
+export interface EntityTypeConfigurationAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<EntityTypeConfigurationAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
+    ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: EntityTypeConfigurationAttribute, context: IConventionContext): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -1185,13 +1096,9 @@ export interface __EntityTypeConfigurationAttributeConvention$views {
 export type EntityTypeConfigurationAttributeConvention = EntityTypeConfigurationAttributeConvention$instance & __EntityTypeConfigurationAttributeConvention$views;
 
 
-export abstract class EntityTypeHierarchyMappingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface EntityTypeHierarchyMappingConvention$instance extends EntityTypeHierarchyMappingConvention$protected, IConvention {
+export interface EntityTypeHierarchyMappingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -1210,12 +1117,8 @@ export interface EntityTypeHierarchyMappingConvention$instance extends IModelFin
 export type EntityTypeHierarchyMappingConvention = EntityTypeHierarchyMappingConvention$instance & __EntityTypeHierarchyMappingConvention$views;
 
 
-export abstract class ForeignKeyAttributeConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ForeignKeyAttributeConvention$instance extends ForeignKeyAttributeConvention$protected, IConvention {
+export interface ForeignKeyAttributeConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessForeignKeyAdded(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
@@ -1246,14 +1149,10 @@ export interface ForeignKeyAttributeConvention$instance extends IComplexProperty
 export type ForeignKeyAttributeConvention = ForeignKeyAttributeConvention$instance & __ForeignKeyAttributeConvention$views;
 
 
-export abstract class ForeignKeyIndexConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected AreIndexedBy(properties: IReadOnlyList<IConventionProperty>, unique: boolean, coveringIndexProperties: IReadOnlyList<IConventionProperty>, coveringIndexUnique: boolean): boolean;
-    protected CreateIndex(properties: IReadOnlyList<IConventionProperty>, unique: boolean, entityTypeBuilder: IConventionEntityTypeBuilder): IConventionIndex | undefined;
-}
-
-
-export interface ForeignKeyIndexConvention$instance extends ForeignKeyIndexConvention$protected, IConvention {
+export interface ForeignKeyIndexConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    AreIndexedBy(properties: IReadOnlyList<IConventionProperty>, unique: boolean, coveringIndexProperties: IReadOnlyList<IConventionProperty>, coveringIndexUnique: boolean): boolean;
+    CreateIndex(properties: IReadOnlyList<IConventionProperty>, unique: boolean, entityTypeBuilder: IConventionEntityTypeBuilder): IConventionIndex | undefined;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessForeignKeyAdded(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
     ProcessForeignKeyPropertiesChanged(relationshipBuilder: IConventionForeignKeyBuilder, oldDependentProperties: IReadOnlyList<IConventionProperty>, oldPrincipalKey: IConventionKey, context: IConventionContext_1<IReadOnlyList<IConventionProperty>>): void;
@@ -1292,12 +1191,8 @@ export interface ForeignKeyIndexConvention$instance extends IEntityTypeBaseTypeC
 export type ForeignKeyIndexConvention = ForeignKeyIndexConvention$instance & __ForeignKeyIndexConvention$views;
 
 
-export abstract class ForeignKeyPropertyDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ForeignKeyPropertyDiscoveryConvention$instance extends ForeignKeyPropertyDiscoveryConvention$protected, IConvention {
+export interface ForeignKeyPropertyDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessEntityTypeMemberIgnored(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, context: IConventionContext_1<System_Internal.String>): void;
     ProcessEntityTypePrimaryKeyChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newPrimaryKey: IConventionKey, previousPrimaryKey: IConventionKey, context: IConventionContext_1<IConventionKey>): void;
     ProcessForeignKeyAdded(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;
@@ -1347,12 +1242,8 @@ export interface ForeignKeyPropertyDiscoveryConvention$instance extends IEntityT
 export type ForeignKeyPropertyDiscoveryConvention = ForeignKeyPropertyDiscoveryConvention$instance & __ForeignKeyPropertyDiscoveryConvention$views;
 
 
-export abstract class IndexAttributeConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface IndexAttributeConvention$instance extends IndexAttributeConvention$protected, IConvention {
+export interface IndexAttributeConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
@@ -1375,12 +1266,7 @@ export interface IndexAttributeConvention$instance extends IEntityTypeAddedConve
 export type IndexAttributeConvention = IndexAttributeConvention$instance & __IndexAttributeConvention$views;
 
 
-export abstract class InversePropertyAttributeConvention$protected {
-    protected TryGetTargetEntityTypeBuilder(entityTypeBuilder: IConventionEntityTypeBuilder, targetClrType: Type, navigationMemberInfo: MemberInfo, shouldCreate?: boolean): IConventionEntityTypeBuilder | undefined;
-}
-
-
-export interface InversePropertyAttributeConvention$instance extends InversePropertyAttributeConvention$protected, NavigationAttributeConventionBase_1<InversePropertyAttribute>, IConvention {
+export interface InversePropertyAttributeConvention$instance extends NavigationAttributeConventionBase_1<InversePropertyAttribute>, IConvention {
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, navigationMemberInfo: MemberInfo, targetClrType: Type, attribute: InversePropertyAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -1394,6 +1280,7 @@ export interface InversePropertyAttributeConvention$instance extends InverseProp
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, context: IConventionContext_1<IConventionNavigationBuilder>): void;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, attribute: InversePropertyAttribute, context: IConventionContext_1<IConventionNavigationBuilder>): void;
+    TryGetTargetEntityTypeBuilder(entityTypeBuilder: IConventionEntityTypeBuilder, targetClrType: Type, navigationMemberInfo: MemberInfo, shouldCreate?: boolean): IConventionEntityTypeBuilder | undefined;
 }
 
 
@@ -1417,20 +1304,14 @@ export interface InversePropertyAttributeConvention$instance extends IModelFinal
 export type InversePropertyAttributeConvention = InversePropertyAttributeConvention$instance & __InversePropertyAttributeConvention$views;
 
 
-export abstract class KeyAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: KeyAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: KeyAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface KeyAttributeConvention$instance extends KeyAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<KeyAttribute>, IConvention {
+export interface KeyAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<KeyAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: KeyAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: KeyAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -1454,16 +1335,9 @@ export interface KeyAttributeConvention$instance extends IEntityTypeAddedConvent
 export type KeyAttributeConvention = KeyAttributeConvention$instance & __KeyAttributeConvention$views;
 
 
-export abstract class KeyDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected DiscoverKeyProperties(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
-    protected ProcessKeyProperties(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
-    protected ShouldDiscoverKeyProperties(entityType: IConventionEntityType): boolean;
-    protected TryConfigurePrimaryKey(entityTypeBuilder: IConventionEntityTypeBuilder): void;
-}
-
-
-export interface KeyDiscoveryConvention$instance extends KeyDiscoveryConvention$protected, IConvention {
+export interface KeyDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    DiscoverKeyProperties(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessEntityTypeMemberIgnored(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, context: IConventionContext_1<System_Internal.String>): void;
@@ -1472,9 +1346,12 @@ export interface KeyDiscoveryConvention$instance extends KeyDiscoveryConvention$
     ProcessForeignKeyPropertiesChanged(relationshipBuilder: IConventionForeignKeyBuilder, oldDependentProperties: IReadOnlyList<IConventionProperty>, oldPrincipalKey: IConventionKey, context: IConventionContext_1<IReadOnlyList<IConventionProperty>>): void;
     ProcessForeignKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, foreignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
     ProcessForeignKeyUniquenessChanged(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<Nullable<System_Internal.Boolean>>): void;
+    ProcessKeyProperties(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
     ProcessKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, key: IConventionKey, context: IConventionContext_1<IConventionKey>): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
     ProcessSkipNavigationForeignKeyChanged(skipNavigationBuilder: IConventionSkipNavigationBuilder, foreignKey: IConventionForeignKey, oldForeignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
+    ShouldDiscoverKeyProperties(entityType: IConventionEntityType): boolean;
+    TryConfigurePrimaryKey(entityTypeBuilder: IConventionEntityTypeBuilder): void;
 }
 
 
@@ -1503,13 +1380,7 @@ export interface KeyDiscoveryConvention$instance extends IEntityTypeAddedConvent
 export type KeyDiscoveryConvention = KeyDiscoveryConvention$instance & __KeyDiscoveryConvention$views;
 
 
-export abstract class KeylessAttributeConvention$protected {
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: KeylessAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface KeylessAttributeConvention$instance extends KeylessAttributeConvention$protected, TypeAttributeConventionBase_1$instance<KeylessAttribute>, IConvention {
+export interface KeylessAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<KeylessAttribute>, IConvention {
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -1526,20 +1397,16 @@ export interface __KeylessAttributeConvention$views {
 export type KeylessAttributeConvention = KeylessAttributeConvention$instance & __KeylessAttributeConvention$views;
 
 
-export abstract class ManyToManyJoinEntityTypeConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected CreateJoinEntityType(joinEntityTypeName: string, skipNavigation: IConventionSkipNavigation): void;
-    protected CreateSkipNavigationForeignKey(skipNavigation: IConventionSkipNavigation, joinEntityTypeBuilder: IConventionEntityTypeBuilder): IConventionForeignKey;
-    protected GenerateJoinTypeName(skipNavigation: IConventionSkipNavigation): string;
-    protected ShouldCreateJoinType(skipNavigation: IConventionSkipNavigation): boolean;
-}
-
-
-export interface ManyToManyJoinEntityTypeConvention$instance extends ManyToManyJoinEntityTypeConvention$protected, IConvention {
+export interface ManyToManyJoinEntityTypeConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    CreateJoinEntityType(joinEntityTypeName: string, skipNavigation: IConventionSkipNavigation): void;
+    CreateSkipNavigationForeignKey(skipNavigation: IConventionSkipNavigation, joinEntityTypeBuilder: IConventionEntityTypeBuilder): IConventionForeignKey;
+    GenerateJoinTypeName(skipNavigation: IConventionSkipNavigation): string;
     ProcessSkipNavigationAdded(skipNavigationBuilder: IConventionSkipNavigationBuilder, context: IConventionContext_1<IConventionSkipNavigationBuilder>): void;
     ProcessSkipNavigationForeignKeyChanged(skipNavigationBuilder: IConventionSkipNavigationBuilder, foreignKey: IConventionForeignKey, oldForeignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
     ProcessSkipNavigationInverseChanged(skipNavigationBuilder: IConventionSkipNavigationBuilder, inverse: IConventionSkipNavigation, oldInverse: IConventionSkipNavigation, context: IConventionContext_1<IConventionSkipNavigation>): void;
     ProcessSkipNavigationRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, navigation: IConventionSkipNavigation, context: IConventionContext_1<IConventionSkipNavigation>): void;
+    ShouldCreateJoinType(skipNavigation: IConventionSkipNavigation): boolean;
 }
 
 
@@ -1560,17 +1427,11 @@ export interface ManyToManyJoinEntityTypeConvention$instance extends ISkipNaviga
 export type ManyToManyJoinEntityTypeConvention = ManyToManyJoinEntityTypeConvention$instance & __ManyToManyJoinEntityTypeConvention$views;
 
 
-export abstract class MaxLengthAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: MaxLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: MaxLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface MaxLengthAttributeConvention$instance extends MaxLengthAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<MaxLengthAttribute>, IConvention {
+export interface MaxLengthAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<MaxLengthAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: MaxLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: MaxLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -1589,12 +1450,8 @@ export interface __MaxLengthAttributeConvention$views {
 export type MaxLengthAttributeConvention = MaxLengthAttributeConvention$instance & __MaxLengthAttributeConvention$views;
 
 
-export abstract class ModelCleanupConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface ModelCleanupConvention$instance extends ModelCleanupConvention$protected, IConvention {
+export interface ModelCleanupConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessForeignKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, foreignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
@@ -1615,12 +1472,8 @@ export interface ModelCleanupConvention$instance extends IForeignKeyRemovedConve
 export type ModelCleanupConvention = ModelCleanupConvention$instance & __ModelCleanupConvention$views;
 
 
-export abstract class NavigationAttributeConventionBase_1$protected<TAttribute extends Attribute> {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface NavigationAttributeConventionBase_1$instance<TAttribute extends Attribute> extends NavigationAttributeConventionBase_1$protected<TAttribute> {
+export interface NavigationAttributeConventionBase_1$instance<TAttribute extends Attribute> {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, navigationMemberInfo: MemberInfo, targetClrType: Type, attribute: TAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -1640,8 +1493,7 @@ export interface NavigationAttributeConventionBase_1$instance<TAttribute extends
 }
 
 
-export const NavigationAttributeConventionBase_1: {
-    new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies): NavigationAttributeConventionBase_1<TAttribute>;
+export const NavigationAttributeConventionBase_1: (abstract new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies) => NavigationAttributeConventionBase_1<TAttribute>) & {
     GetAttributes<TAttribute extends Attribute, TCustomAttribute extends Attribute>(entityType: IConventionEntityType, navigation: IConventionNavigation): IEnumerable<TCustomAttribute>;
     GetAttributes<TAttribute extends Attribute, TCustomAttribute extends Attribute>(entityType: IConventionEntityType, skipNavigation: IConventionSkipNavigation): IEnumerable<TCustomAttribute>;
 };
@@ -1670,12 +1522,8 @@ export interface __NavigationBackingFieldAttributeConvention$views {
 export type NavigationBackingFieldAttributeConvention = NavigationBackingFieldAttributeConvention$instance & __NavigationBackingFieldAttributeConvention$views;
 
 
-export abstract class NavigationEagerLoadingConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface NavigationEagerLoadingConvention$instance extends NavigationEagerLoadingConvention$protected, IConvention {
+export interface NavigationEagerLoadingConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessForeignKeyOwnershipChanged(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<Nullable<System_Internal.Boolean>>): void;
 }
 
@@ -1694,18 +1542,13 @@ export interface NavigationEagerLoadingConvention$instance extends IForeignKeyOw
 export type NavigationEagerLoadingConvention = NavigationEagerLoadingConvention$instance & __NavigationEagerLoadingConvention$views;
 
 
-export abstract class NonNullableConventionBase$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected TryGetNullabilityInfo(modelBuilder: IConventionModelBuilder, memberInfo: MemberInfo, nullabilityInfo: NullabilityInfo): boolean;
-}
-
-
-export interface NonNullableConventionBase$instance extends NonNullableConventionBase$protected {
+export interface NonNullableConventionBase$instance {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    TryGetNullabilityInfo(modelBuilder: IConventionModelBuilder, memberInfo: MemberInfo, nullabilityInfo: NullabilityInfo): boolean;
 }
 
 
-export const NonNullableConventionBase: {
-    new(dependencies: ProviderConventionSetBuilderDependencies): NonNullableConventionBase;
+export const NonNullableConventionBase: (abstract new(dependencies: ProviderConventionSetBuilderDependencies) => NonNullableConventionBase) & {
 };
 
 
@@ -1759,15 +1602,11 @@ export interface NonNullableReferencePropertyConvention$instance extends IComple
 export type NonNullableReferencePropertyConvention = NonNullableReferencePropertyConvention$instance & __NonNullableReferencePropertyConvention$views;
 
 
-export abstract class NotMappedMemberAttributeConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected ShouldIgnore(memberInfo: MemberInfo): boolean;
-}
-
-
-export interface NotMappedMemberAttributeConvention$instance extends NotMappedMemberAttributeConvention$protected, IConvention {
+export interface NotMappedMemberAttributeConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
+    ShouldIgnore(memberInfo: MemberInfo): boolean;
 }
 
 
@@ -1786,13 +1625,7 @@ export interface NotMappedMemberAttributeConvention$instance extends IComplexPro
 export type NotMappedMemberAttributeConvention = NotMappedMemberAttributeConvention$instance & __NotMappedMemberAttributeConvention$views;
 
 
-export abstract class NotMappedTypeAttributeConvention$protected {
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: NotMappedAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface NotMappedTypeAttributeConvention$instance extends NotMappedTypeAttributeConvention$protected, TypeAttributeConventionBase_1$instance<NotMappedAttribute>, IConvention {
+export interface NotMappedTypeAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<NotMappedAttribute>, IConvention {
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -1809,16 +1642,9 @@ export interface __NotMappedTypeAttributeConvention$views {
 export type NotMappedTypeAttributeConvention = NotMappedTypeAttributeConvention$instance & __NotMappedTypeAttributeConvention$views;
 
 
-export abstract class OwnedAttributeConvention$protected {
-    protected ProcessComplexTypeAdded2(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: OwnedAttribute, context: IConventionContext): void;
-    protected ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: unknown, context: IConventionContext): void;
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: OwnedAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface OwnedAttributeConvention$instance extends OwnedAttributeConvention$protected, TypeAttributeConventionBase_1$instance<OwnedAttribute>, IConvention {
+export interface OwnedAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<OwnedAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
+    ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: OwnedAttribute, context: IConventionContext): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -1836,16 +1662,10 @@ export interface __OwnedAttributeConvention$views {
 export type OwnedAttributeConvention = OwnedAttributeConvention$instance & __OwnedAttributeConvention$views;
 
 
-export abstract class PrecisionAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: PrecisionAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: PrecisionAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface PrecisionAttributeConvention$instance extends PrecisionAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<PrecisionAttribute>, IConvention {
+export interface PrecisionAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<PrecisionAttribute>, IConvention {
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: PrecisionAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: PrecisionAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -1863,23 +1683,18 @@ export interface __PrecisionAttributeConvention$views {
 export type PrecisionAttributeConvention = PrecisionAttributeConvention$instance & __PrecisionAttributeConvention$views;
 
 
-export abstract class PropertyAttributeConventionBase_1$protected<TAttribute extends Attribute> {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected abstract ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: TAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: TAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface PropertyAttributeConventionBase_1$instance<TAttribute extends Attribute> extends PropertyAttributeConventionBase_1$protected<TAttribute>, IConvention {
+export interface PropertyAttributeConventionBase_1$instance<TAttribute extends Attribute> extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessComplexPropertyFieldChanged(propertyBuilder: IConventionComplexPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: TAttribute, clrMember: MemberInfo, context: IConventionContext): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: TAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
 
-export const PropertyAttributeConventionBase_1: {
-    new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies): PropertyAttributeConventionBase_1<TAttribute>;
+export const PropertyAttributeConventionBase_1: (abstract new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies) => PropertyAttributeConventionBase_1<TAttribute>) & {
 };
 
 
@@ -1893,16 +1708,12 @@ export interface PropertyAttributeConventionBase_1$instance<TAttribute extends A
 export type PropertyAttributeConventionBase_1<TAttribute extends Attribute> = PropertyAttributeConventionBase_1$instance<TAttribute> & __PropertyAttributeConventionBase_1$views<TAttribute>;
 
 
-export abstract class PropertyDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly UseAttributes: boolean;
-    protected DiscoverPrimitiveProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
-    protected GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
-    protected IsCandidatePrimitiveProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, mapping: CoreTypeMapping): boolean;
-}
-
-
-export interface PropertyDiscoveryConvention$instance extends PropertyDiscoveryConvention$protected, IConvention {
+export interface PropertyDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly UseAttributes: boolean;
+    DiscoverPrimitiveProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
+    GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
+    IsCandidatePrimitiveProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, mapping: CoreTypeMapping): boolean;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -1925,13 +1736,9 @@ export interface PropertyDiscoveryConvention$instance extends IComplexPropertyAd
 export type PropertyDiscoveryConvention = PropertyDiscoveryConvention$instance & __PropertyDiscoveryConvention$views;
 
 
-export abstract class PropertyOverridesConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface PropertyOverridesConvention$instance extends PropertyOverridesConvention$protected, IConvention {
+export interface PropertyOverridesConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
 }
 
@@ -1950,13 +1757,9 @@ export interface PropertyOverridesConvention$instance extends IPropertyAddedConv
 export type PropertyOverridesConvention = PropertyOverridesConvention$instance & __PropertyOverridesConvention$views;
 
 
-export abstract class QueryFilterRewritingConvention$protected {
-    protected DbSetAccessRewriter: QueryFilterRewritingConvention_DbSetAccessRewritingExpressionVisitor;
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-}
-
-
-export interface QueryFilterRewritingConvention$instance extends QueryFilterRewritingConvention$protected, IConvention {
+export interface QueryFilterRewritingConvention$instance extends IConvention {
+    DbSetAccessRewriter: unknown;
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -1975,16 +1778,10 @@ export interface QueryFilterRewritingConvention$instance extends IModelFinalizin
 export type QueryFilterRewritingConvention = QueryFilterRewritingConvention$instance & __QueryFilterRewritingConvention$views;
 
 
-export abstract class RelationalColumnAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: ColumnAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface RelationalColumnAttributeConvention$instance extends RelationalColumnAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<ColumnAttribute>, IConvention {
+export interface RelationalColumnAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<ColumnAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: ColumnAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2002,16 +1799,10 @@ export interface __RelationalColumnAttributeConvention$views {
 export type RelationalColumnAttributeConvention = RelationalColumnAttributeConvention$instance & __RelationalColumnAttributeConvention$views;
 
 
-export abstract class RelationalColumnCommentAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: CommentAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface RelationalColumnCommentAttributeConvention$instance extends RelationalColumnCommentAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<CommentAttribute>, IConvention {
+export interface RelationalColumnCommentAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<CommentAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: CommentAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2029,14 +1820,10 @@ export interface __RelationalColumnCommentAttributeConvention$views {
 export type RelationalColumnCommentAttributeConvention = RelationalColumnCommentAttributeConvention$instance & __RelationalColumnCommentAttributeConvention$views;
 
 
-export abstract class RelationalDbFunctionAttributeConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessDbFunctionAdded(dbFunctionBuilder: IConventionDbFunctionBuilder, context: IConventionContext): void;
-}
-
-
-export interface RelationalDbFunctionAttributeConvention$instance extends RelationalDbFunctionAttributeConvention$protected, IConvention {
+export interface RelationalDbFunctionAttributeConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
+    ProcessDbFunctionAdded(dbFunctionBuilder: IConventionDbFunctionBuilder, context: IConventionContext): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
     ProcessModelInitialized(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
@@ -2057,16 +1844,10 @@ export interface RelationalDbFunctionAttributeConvention$instance extends IModel
 export type RelationalDbFunctionAttributeConvention = RelationalDbFunctionAttributeConvention$instance & __RelationalDbFunctionAttributeConvention$views;
 
 
-export abstract class RelationalKeyDiscoveryConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected DiscoverKeyProperties2(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
-    protected DiscoverKeyProperties(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
-    protected ProcessKeyProperties2(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
-    protected ProcessKeyProperties(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
-}
-
-
-export interface RelationalKeyDiscoveryConvention$instance extends RelationalKeyDiscoveryConvention$protected, KeyDiscoveryConvention$instance, IConvention {
+export interface RelationalKeyDiscoveryConvention$instance extends KeyDiscoveryConvention$instance, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
+    DiscoverKeyProperties(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
+    DiscoverKeyProperties(entityType: IConventionEntityType): List<IConventionProperty> | undefined;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeAnnotationChanged(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation, context: IConventionContext_1<IConventionAnnotation>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -2076,6 +1857,8 @@ export interface RelationalKeyDiscoveryConvention$instance extends RelationalKey
     ProcessForeignKeyPropertiesChanged(relationshipBuilder: IConventionForeignKeyBuilder, oldDependentProperties: IReadOnlyList<IConventionProperty>, oldPrincipalKey: IConventionKey, context: IConventionContext_1<IReadOnlyList<IConventionProperty>>): void;
     ProcessForeignKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, foreignKey: IConventionForeignKey, context: IConventionContext_1<IConventionForeignKey>): void;
     ProcessForeignKeyUniquenessChanged(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<Nullable<System_Internal.Boolean>>): void;
+    ProcessKeyProperties(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
+    ProcessKeyProperties(keyProperties: IList<IConventionProperty>, entityType: IConventionEntityType): void;
     ProcessKeyRemoved(entityTypeBuilder: IConventionEntityTypeBuilder, key: IConventionKey, context: IConventionContext_1<IConventionKey>): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
@@ -2109,13 +1892,9 @@ export interface RelationalKeyDiscoveryConvention$instance extends IEntityTypeAn
 export type RelationalKeyDiscoveryConvention = RelationalKeyDiscoveryConvention$instance & __RelationalKeyDiscoveryConvention$views;
 
 
-export abstract class RelationalMapToJsonConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface RelationalMapToJsonConvention$instance extends RelationalMapToJsonConvention$protected, IConvention {
+export interface RelationalMapToJsonConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAnnotationChanged(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation, context: IConventionContext_1<IConventionAnnotation>): void;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
@@ -2136,14 +1915,10 @@ export interface RelationalMapToJsonConvention$instance extends IEntityTypeAnnot
 export type RelationalMapToJsonConvention = RelationalMapToJsonConvention$instance & __RelationalMapToJsonConvention$views;
 
 
-export abstract class RelationalMaxIdentifierLengthConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface RelationalMaxIdentifierLengthConvention$instance extends RelationalMaxIdentifierLengthConvention$protected, IConvention {
+export interface RelationalMaxIdentifierLengthConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     readonly MaxIdentifierLength: int;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelInitialized(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2162,12 +1937,8 @@ export interface RelationalMaxIdentifierLengthConvention$instance extends IModel
 export type RelationalMaxIdentifierLengthConvention = RelationalMaxIdentifierLengthConvention$instance & __RelationalMaxIdentifierLengthConvention$views;
 
 
-export abstract class RelationalNavigationJsonPropertyNameAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface RelationalNavigationJsonPropertyNameAttributeConvention$instance extends RelationalNavigationJsonPropertyNameAttributeConvention$protected, NavigationAttributeConventionBase_1<JsonPropertyNameAttribute>, IConvention {
+export interface RelationalNavigationJsonPropertyNameAttributeConvention$instance extends NavigationAttributeConventionBase_1<JsonPropertyNameAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, context: IConventionContext_1<IConventionNavigationBuilder>): void;
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, attribute: JsonPropertyNameAttribute, context: IConventionContext_1<IConventionNavigationBuilder>): void;
 }
@@ -2185,16 +1956,10 @@ export interface __RelationalNavigationJsonPropertyNameAttributeConvention$views
 export type RelationalNavigationJsonPropertyNameAttributeConvention = RelationalNavigationJsonPropertyNameAttributeConvention$instance & __RelationalNavigationJsonPropertyNameAttributeConvention$views;
 
 
-export abstract class RelationalPropertyJsonPropertyNameAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: JsonPropertyNameAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface RelationalPropertyJsonPropertyNameAttributeConvention$instance extends RelationalPropertyJsonPropertyNameAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<JsonPropertyNameAttribute>, IConvention {
+export interface RelationalPropertyJsonPropertyNameAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<JsonPropertyNameAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: JsonPropertyNameAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2212,12 +1977,8 @@ export interface __RelationalPropertyJsonPropertyNameAttributeConvention$views {
 export type RelationalPropertyJsonPropertyNameAttributeConvention = RelationalPropertyJsonPropertyNameAttributeConvention$instance & __RelationalPropertyJsonPropertyNameAttributeConvention$views;
 
 
-export abstract class RelationalQueryFilterRewritingConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface RelationalQueryFilterRewritingConvention$instance extends RelationalQueryFilterRewritingConvention$protected, QueryFilterRewritingConvention$instance, IConvention {
+export interface RelationalQueryFilterRewritingConvention$instance extends QueryFilterRewritingConvention$instance, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2234,35 +1995,31 @@ export interface __RelationalQueryFilterRewritingConvention$views {
 export type RelationalQueryFilterRewritingConvention = RelationalQueryFilterRewritingConvention$instance & __RelationalQueryFilterRewritingConvention$views;
 
 
-export abstract class RelationalRuntimeModelConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessComplexTypeAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
-    protected ProcessComplexTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
-    protected ProcessEntityTypeAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
-    protected ProcessEntityTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
-    protected ProcessEntityTypeMappingFragmentAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityTypeMappingFragment: IEntityTypeMappingFragment, runtimeEntityTypeMappingFragment: RuntimeEntityTypeMappingFragment, runtime: boolean): void;
-    protected ProcessForeignKeyAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
-    protected ProcessForeignKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
-    protected ProcessFunctionAnnotations(annotations: Dictionary<System_Internal.String, unknown>, function_: IDbFunction, runtimeFunction: RuntimeDbFunction, runtime: boolean): void;
-    protected ProcessFunctionParameterAnnotations(annotations: Dictionary<System_Internal.String, unknown>, parameter: IDbFunctionParameter, runtimeParameter: RuntimeDbFunctionParameter, runtime: boolean): void;
-    protected ProcessIndexAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
-    protected ProcessIndexAnnotations(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
-    protected ProcessKeyAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
-    protected ProcessKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
-    protected ProcessModelAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
-    protected ProcessModelAnnotations(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
-    protected ProcessPropertyAnnotations2(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
-    protected ProcessPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
-    protected ProcessPropertyOverridesAnnotations(annotations: Dictionary<System_Internal.String, unknown>, propertyOverrides: IRelationalPropertyOverrides, runtimePropertyOverrides: RuntimeRelationalPropertyOverrides, runtime: boolean): void;
-    protected ProcessSequenceAnnotations(annotations: Dictionary<System_Internal.String, unknown>, sequence: ISequence, runtimeSequence: RuntimeSequence, runtime: boolean): void;
-    protected ProcessStoredProcedureAnnotations(annotations: Dictionary<System_Internal.String, unknown>, storedProcedure: IStoredProcedure, runtimeStoredProcedure: RuntimeStoredProcedure, runtime: boolean): void;
-    protected ProcessStoredProcedureParameterAnnotations(annotations: Dictionary<System_Internal.String, unknown>, parameter: IStoredProcedureParameter, runtimeParameter: RuntimeStoredProcedureParameter, runtime: boolean): void;
-    protected ProcessStoredProcedureResultColumnAnnotations(annotations: Dictionary<System_Internal.String, unknown>, resultColumn: IStoredProcedureResultColumn, runtimeResultColumn: RuntimeStoredProcedureResultColumn, runtime: boolean): void;
-}
-
-
-export interface RelationalRuntimeModelConvention$instance extends RelationalRuntimeModelConvention$protected, RuntimeModelConvention$instance, IConvention {
+export interface RelationalRuntimeModelConvention$instance extends RuntimeModelConvention$instance, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
+    ProcessComplexTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
+    ProcessComplexTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
+    ProcessEntityTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
+    ProcessEntityTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
+    ProcessEntityTypeMappingFragmentAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityTypeMappingFragment: IEntityTypeMappingFragment, runtimeEntityTypeMappingFragment: RuntimeEntityTypeMappingFragment, runtime: boolean): void;
+    ProcessForeignKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
+    ProcessForeignKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
+    ProcessFunctionAnnotations(annotations: Dictionary<System_Internal.String, unknown>, function_: IDbFunction, runtimeFunction: RuntimeDbFunction, runtime: boolean): void;
+    ProcessFunctionParameterAnnotations(annotations: Dictionary<System_Internal.String, unknown>, parameter: IDbFunctionParameter, runtimeParameter: RuntimeDbFunctionParameter, runtime: boolean): void;
+    ProcessIndexAnnotations(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
+    ProcessIndexAnnotations(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
+    ProcessKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
+    ProcessKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
+    ProcessModelAnnotations(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
+    ProcessModelAnnotations(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
     ProcessModelFinalized(model: IModel): IModel;
+    ProcessPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
+    ProcessPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
+    ProcessPropertyOverridesAnnotations(annotations: Dictionary<System_Internal.String, unknown>, propertyOverrides: IRelationalPropertyOverrides, runtimePropertyOverrides: RuntimeRelationalPropertyOverrides, runtime: boolean): void;
+    ProcessSequenceAnnotations(annotations: Dictionary<System_Internal.String, unknown>, sequence: ISequence, runtimeSequence: RuntimeSequence, runtime: boolean): void;
+    ProcessStoredProcedureAnnotations(annotations: Dictionary<System_Internal.String, unknown>, storedProcedure: IStoredProcedure, runtimeStoredProcedure: RuntimeStoredProcedure, runtime: boolean): void;
+    ProcessStoredProcedureParameterAnnotations(annotations: Dictionary<System_Internal.String, unknown>, parameter: IStoredProcedureParameter, runtimeParameter: RuntimeStoredProcedureParameter, runtime: boolean): void;
+    ProcessStoredProcedureResultColumnAnnotations(annotations: Dictionary<System_Internal.String, unknown>, resultColumn: IStoredProcedureResultColumn, runtimeResultColumn: RuntimeStoredProcedureResultColumn, runtime: boolean): void;
 }
 
 
@@ -2278,14 +2035,8 @@ export interface __RelationalRuntimeModelConvention$views {
 export type RelationalRuntimeModelConvention = RelationalRuntimeModelConvention$instance & __RelationalRuntimeModelConvention$views;
 
 
-export abstract class RelationalTableAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: TableAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface RelationalTableAttributeConvention$instance extends RelationalTableAttributeConvention$protected, TypeAttributeConventionBase_1$instance<TableAttribute>, IConvention {
+export interface RelationalTableAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<TableAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -2302,14 +2053,8 @@ export interface __RelationalTableAttributeConvention$views {
 export type RelationalTableAttributeConvention = RelationalTableAttributeConvention$instance & __RelationalTableAttributeConvention$views;
 
 
-export abstract class RelationalTableCommentAttributeConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected ProcessEntityTypeAdded3(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: CommentAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected abstract ProcessEntityTypeAdded2(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: unknown, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-}
-
-
-export interface RelationalTableCommentAttributeConvention$instance extends RelationalTableCommentAttributeConvention$protected, TypeAttributeConventionBase_1$instance<CommentAttribute>, IConvention {
+export interface RelationalTableCommentAttributeConvention$instance extends TypeAttributeConventionBase_1$instance<CommentAttribute>, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -2326,15 +2071,11 @@ export interface __RelationalTableCommentAttributeConvention$views {
 export type RelationalTableCommentAttributeConvention = RelationalTableCommentAttributeConvention$instance & __RelationalTableCommentAttributeConvention$views;
 
 
-export abstract class RelationalValueGenerationConvention$protected {
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected GetValueGenerated2(property: IConventionProperty): Nullable<ValueGenerated>;
-    protected GetValueGenerated(property: IConventionProperty): Nullable<ValueGenerated>;
-    protected MappingStrategyAllowsValueGeneration(property: IConventionProperty, mappingStrategy: string): boolean;
-}
-
-
-export interface RelationalValueGenerationConvention$instance extends RelationalValueGenerationConvention$protected, ValueGenerationConvention$instance, IConvention {
+export interface RelationalValueGenerationConvention$instance extends ValueGenerationConvention$instance, IConvention {
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
+    GetValueGenerated(property: IConventionProperty): Nullable<ValueGenerated>;
+    GetValueGenerated(property: IConventionProperty): Nullable<ValueGenerated>;
+    MappingStrategyAllowsValueGeneration(property: IConventionProperty, mappingStrategy: string): boolean;
     ProcessEntityTypeAnnotationChanged(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation, context: IConventionContext_1<IConventionAnnotation>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessEntityTypePrimaryKeyChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newPrimaryKey: IConventionKey, previousPrimaryKey: IConventionKey, context: IConventionContext_1<IConventionKey>): void;
@@ -2367,16 +2108,10 @@ export interface RelationalValueGenerationConvention$instance extends IEntityTyp
 export type RelationalValueGenerationConvention = RelationalValueGenerationConvention$instance & __RelationalValueGenerationConvention$views;
 
 
-export abstract class RelationshipDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly UseAttributes: boolean;
-    protected DiscoverRelationships(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext, discoverUnmatchedInverses?: boolean): void;
-    protected ShouldBeOwned(targetType: Type, model: IConventionModel): Nullable<System_Internal.Boolean>;
-    protected TryGetTargetEntityTypeBuilder(entityTypeBuilder: IConventionEntityTypeBuilder, targetClrType: Type, navigationMemberInfo: MemberInfo, shouldBeOwned?: Nullable<System_Internal.Boolean>, shouldCreate?: boolean): IConventionEntityTypeBuilder | undefined;
-}
-
-
-export interface RelationshipDiscoveryConvention$instance extends RelationshipDiscoveryConvention$protected, IConvention {
+export interface RelationshipDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly UseAttributes: boolean;
+    DiscoverRelationships(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext, discoverUnmatchedInverses?: boolean): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessEntityTypeMemberIgnored(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, context: IConventionContext_1<System_Internal.String>): void;
@@ -2386,6 +2121,8 @@ export interface RelationshipDiscoveryConvention$instance extends RelationshipDi
     ProcessNavigationAdded(navigationBuilder: IConventionNavigationBuilder, context: IConventionContext_1<IConventionNavigationBuilder>): void;
     ProcessNavigationRemoved(sourceEntityTypeBuilder: IConventionEntityTypeBuilder, targetEntityTypeBuilder: IConventionEntityTypeBuilder, navigationName: string, memberInfo: MemberInfo, context: IConventionContext_1<System_Internal.String>): void;
     ProcessTypeIgnored(modelBuilder: IConventionModelBuilder, name: string, type: Type, context: IConventionContext_1<System_Internal.String>): void;
+    ShouldBeOwned(targetType: Type, model: IConventionModel): Nullable<System_Internal.Boolean>;
+    TryGetTargetEntityTypeBuilder(entityTypeBuilder: IConventionEntityTypeBuilder, targetClrType: Type, navigationMemberInfo: MemberInfo, shouldBeOwned?: Nullable<System_Internal.Boolean>, shouldCreate?: boolean): IConventionEntityTypeBuilder | undefined;
 }
 
 
@@ -2435,18 +2172,12 @@ export interface __RequiredNavigationAttributeConvention$views {
 export type RequiredNavigationAttributeConvention = RequiredNavigationAttributeConvention$instance & __RequiredNavigationAttributeConvention$views;
 
 
-export abstract class RequiredPropertyAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: RequiredAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionComplexPropertyBuilder, attribute: RequiredAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface RequiredPropertyAttributeConvention$instance extends RequiredPropertyAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<RequiredAttribute>, IConvention {
+export interface RequiredPropertyAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<RequiredAttribute>, IConvention {
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
     ProcessComplexPropertyFieldChanged(propertyBuilder: IConventionComplexPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, attribute: RequiredAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: RequiredAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2466,31 +2197,27 @@ export interface __RequiredPropertyAttributeConvention$views {
 export type RequiredPropertyAttributeConvention = RequiredPropertyAttributeConvention$instance & __RequiredPropertyAttributeConvention$views;
 
 
-export abstract class RuntimeModelConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected Create(model: IModel): RuntimeModel;
-    protected GetForeignKey(foreignKey: IForeignKey, entityType: RuntimeEntityType): RuntimeForeignKey;
-    protected GetIndex(index: IIndex, entityType: RuntimeEntityType): RuntimeIndex;
-    protected GetKey(key: IKey, entityType: RuntimeEntityType): RuntimeKey;
-    protected ProcessComplexPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IComplexProperty, runtimeProperty: RuntimeComplexProperty, runtime: boolean): void;
-    protected ProcessComplexTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
-    protected ProcessElementTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, element: IElementType, runtimeElement: RuntimeElementType, runtime: boolean): void;
-    protected ProcessEntityTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
-    protected ProcessForeignKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
-    protected ProcessIndexAnnotations(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
-    protected ProcessKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
-    protected ProcessModelAnnotations(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
-    protected ProcessNavigationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, navigation: INavigation, runtimeNavigation: RuntimeNavigation, runtime: boolean): void;
-    protected ProcessPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
-    protected ProcessServicePropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IServiceProperty, runtimeProperty: RuntimeServiceProperty, runtime: boolean): void;
-    protected ProcessSkipNavigationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, skipNavigation: ISkipNavigation, runtimeSkipNavigation: RuntimeSkipNavigation, runtime: boolean): void;
-    protected ProcessTriggerAnnotations(annotations: Dictionary<System_Internal.String, unknown>, trigger: ITrigger, runtimeTrigger: RuntimeTrigger, runtime: boolean): void;
-    protected ProcessTypeMappingConfigurationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, typeConfiguration: ITypeMappingConfiguration, runtimeTypeConfiguration: RuntimeTypeMappingConfiguration, runtime: boolean): void;
-}
-
-
-export interface RuntimeModelConvention$instance extends RuntimeModelConvention$protected, IConvention {
+export interface RuntimeModelConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    Create(model: IModel): RuntimeModel;
+    GetForeignKey(foreignKey: IForeignKey, entityType: RuntimeEntityType): RuntimeForeignKey;
+    GetIndex(index: IIndex, entityType: RuntimeEntityType): RuntimeIndex;
+    GetKey(key: IKey, entityType: RuntimeEntityType): RuntimeKey;
+    ProcessComplexPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IComplexProperty, runtimeProperty: RuntimeComplexProperty, runtime: boolean): void;
+    ProcessComplexTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, complexType: IComplexType, runtimeComplexType: RuntimeComplexType, runtime: boolean): void;
+    ProcessElementTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, element: IElementType, runtimeElement: RuntimeElementType, runtime: boolean): void;
+    ProcessEntityTypeAnnotations(annotations: Dictionary<System_Internal.String, unknown>, entityType: IEntityType, runtimeEntityType: RuntimeEntityType, runtime: boolean): void;
+    ProcessForeignKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, foreignKey: IForeignKey, runtimeForeignKey: RuntimeForeignKey, runtime: boolean): void;
+    ProcessIndexAnnotations(annotations: Dictionary<System_Internal.String, unknown>, index: IIndex, runtimeIndex: RuntimeIndex, runtime: boolean): void;
+    ProcessKeyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, key: IKey, runtimeKey: RuntimeKey, runtime: boolean): void;
+    ProcessModelAnnotations(annotations: Dictionary<System_Internal.String, unknown>, model: IModel, runtimeModel: RuntimeModel, runtime: boolean): void;
     ProcessModelFinalized(model: IModel): IModel;
+    ProcessNavigationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, navigation: INavigation, runtimeNavigation: RuntimeNavigation, runtime: boolean): void;
+    ProcessPropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IProperty, runtimeProperty: RuntimeProperty, runtime: boolean): void;
+    ProcessServicePropertyAnnotations(annotations: Dictionary<System_Internal.String, unknown>, property: IServiceProperty, runtimeProperty: RuntimeServiceProperty, runtime: boolean): void;
+    ProcessSkipNavigationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, skipNavigation: ISkipNavigation, runtimeSkipNavigation: RuntimeSkipNavigation, runtime: boolean): void;
+    ProcessTriggerAnnotations(annotations: Dictionary<System_Internal.String, unknown>, trigger: ITrigger, runtimeTrigger: RuntimeTrigger, runtime: boolean): void;
+    ProcessTypeMappingConfigurationAnnotations(annotations: Dictionary<System_Internal.String, unknown>, typeConfiguration: ITypeMappingConfiguration, runtimeTypeConfiguration: RuntimeTypeMappingConfiguration, runtime: boolean): void;
 }
 
 
@@ -2508,13 +2235,9 @@ export interface RuntimeModelConvention$instance extends IModelFinalizedConventi
 export type RuntimeModelConvention = RuntimeModelConvention$instance & __RuntimeModelConvention$views;
 
 
-export abstract class SequenceUniquificationConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface SequenceUniquificationConvention$instance extends SequenceUniquificationConvention$protected, IConvention {
+export interface SequenceUniquificationConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2533,16 +2256,12 @@ export interface SequenceUniquificationConvention$instance extends IModelFinaliz
 export type SequenceUniquificationConvention = SequenceUniquificationConvention$instance & __SequenceUniquificationConvention$views;
 
 
-export abstract class ServicePropertyDiscoveryConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly UseAttributes: boolean;
-    protected DiscoverServiceProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
-    protected GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
-    protected IsCandidateServiceProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, factory: IParameterBindingFactory): boolean;
-}
-
-
-export interface ServicePropertyDiscoveryConvention$instance extends ServicePropertyDiscoveryConvention$protected, IConvention {
+export interface ServicePropertyDiscoveryConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly UseAttributes: boolean;
+    DiscoverServiceProperties(structuralTypeBuilder: IConventionTypeBaseBuilder, context: IConventionContext): void;
+    GetMembers(structuralType: IConventionTypeBase): IEnumerable<MemberInfo>;
+    IsCandidateServiceProperty(memberInfo: MemberInfo, structuralType: IConventionTypeBase, factory: IParameterBindingFactory): boolean;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
 }
@@ -2563,25 +2282,21 @@ export interface ServicePropertyDiscoveryConvention$instance extends IEntityType
 export type ServicePropertyDiscoveryConvention = ServicePropertyDiscoveryConvention$instance & __ServicePropertyDiscoveryConvention$views;
 
 
-export abstract class SharedTableConvention$protected {
-    protected readonly CheckConstraintsUniqueAcrossTables: boolean;
-    protected readonly DefaultConstraintsUniqueAcrossTables: boolean;
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly ForeignKeysUniqueAcrossTables: boolean;
-    protected readonly IndexesUniqueAcrossTables: boolean;
-    protected readonly KeysUniqueAcrossTables: boolean;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected readonly TriggersUniqueAcrossTables: boolean;
-    protected AreCompatible(key: IReadOnlyKey, duplicateKey: IReadOnlyKey, storeObject: StoreObjectIdentifier): boolean;
-    protected AreCompatible(index: IReadOnlyIndex, duplicateIndex: IReadOnlyIndex, storeObject: StoreObjectIdentifier): boolean;
-    protected AreCompatible(foreignKey: IReadOnlyForeignKey, duplicateForeignKey: IReadOnlyForeignKey, storeObject: StoreObjectIdentifier): boolean;
-    protected AreCompatible(checkConstraint: IReadOnlyCheckConstraint, duplicateCheckConstraint: IReadOnlyCheckConstraint, storeObject: StoreObjectIdentifier): boolean;
-    protected AreCompatible(trigger: IReadOnlyTrigger, duplicateTrigger: IReadOnlyTrigger, storeObject: StoreObjectIdentifier): boolean;
-    protected AreCompatibleDefaultConstraints(property: IReadOnlyProperty, duplicateProperty: IReadOnlyProperty, storeObject: StoreObjectIdentifier): boolean;
-}
-
-
-export interface SharedTableConvention$instance extends SharedTableConvention$protected, IConvention {
+export interface SharedTableConvention$instance extends IConvention {
+    readonly CheckConstraintsUniqueAcrossTables: boolean;
+    readonly DefaultConstraintsUniqueAcrossTables: boolean;
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly ForeignKeysUniqueAcrossTables: boolean;
+    readonly IndexesUniqueAcrossTables: boolean;
+    readonly KeysUniqueAcrossTables: boolean;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
+    readonly TriggersUniqueAcrossTables: boolean;
+    AreCompatible(key: IReadOnlyKey, duplicateKey: IReadOnlyKey, storeObject: StoreObjectIdentifier): boolean;
+    AreCompatible(index: IReadOnlyIndex, duplicateIndex: IReadOnlyIndex, storeObject: StoreObjectIdentifier): boolean;
+    AreCompatible(foreignKey: IReadOnlyForeignKey, duplicateForeignKey: IReadOnlyForeignKey, storeObject: StoreObjectIdentifier): boolean;
+    AreCompatible(checkConstraint: IReadOnlyCheckConstraint, duplicateCheckConstraint: IReadOnlyCheckConstraint, storeObject: StoreObjectIdentifier): boolean;
+    AreCompatible(trigger: IReadOnlyTrigger, duplicateTrigger: IReadOnlyTrigger, storeObject: StoreObjectIdentifier): boolean;
+    AreCompatibleDefaultConstraints(property: IReadOnlyProperty, duplicateProperty: IReadOnlyProperty, storeObject: StoreObjectIdentifier): boolean;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2600,13 +2315,9 @@ export interface SharedTableConvention$instance extends IModelFinalizingConventi
 export type SharedTableConvention = SharedTableConvention$instance & __SharedTableConvention$views;
 
 
-export abstract class StoredProcedureConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface StoredProcedureConvention$instance extends StoredProcedureConvention$protected, IConvention {
+export interface StoredProcedureConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
 }
 
@@ -2625,16 +2336,12 @@ export interface StoredProcedureConvention$instance extends IEntityTypeAddedConv
 export type StoredProcedureConvention = StoredProcedureConvention$instance & __StoredProcedureConvention$views;
 
 
-export abstract class StoreGenerationConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-    protected Validate(property: IConventionProperty, storeObject: StoreObjectIdentifier): void;
-}
-
-
-export interface StoreGenerationConvention$instance extends StoreGenerationConvention$protected, IConvention {
+export interface StoreGenerationConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
     ProcessPropertyAnnotationChanged(propertyBuilder: IConventionPropertyBuilder, name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation, context: IConventionContext_1<IConventionAnnotation>): void;
+    Validate(property: IConventionProperty, storeObject: StoreObjectIdentifier): void;
 }
 
 
@@ -2653,15 +2360,9 @@ export interface StoreGenerationConvention$instance extends IModelFinalizingConv
 export type StoreGenerationConvention = StoreGenerationConvention$instance & __StoreGenerationConvention$views;
 
 
-export abstract class StringLengthAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: StringLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface StringLengthAttributeConvention$instance extends StringLengthAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<StringLengthAttribute>, IConvention {
+export interface StringLengthAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<StringLengthAttribute>, IConvention {
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: StringLengthAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2679,13 +2380,9 @@ export interface __StringLengthAttributeConvention$views {
 export type StringLengthAttributeConvention = StringLengthAttributeConvention$instance & __StringLengthAttributeConvention$views;
 
 
-export abstract class TableNameFromDbSetConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface TableNameFromDbSetConvention$instance extends TableNameFromDbSetConvention$protected, IConvention {
+export interface TableNameFromDbSetConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
     ProcessEntityTypeAnnotationChanged(entityTypeBuilder: IConventionEntityTypeBuilder, name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation, context: IConventionContext_1<IConventionAnnotation>): void;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
@@ -2710,13 +2407,9 @@ export interface TableNameFromDbSetConvention$instance extends IEntityTypeAddedC
 export type TableNameFromDbSetConvention = TableNameFromDbSetConvention$instance & __TableNameFromDbSetConvention$views;
 
 
-export abstract class TableSharingConcurrencyTokenConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface TableSharingConcurrencyTokenConvention$instance extends TableSharingConcurrencyTokenConvention$protected, IConvention {
+export interface TableSharingConcurrencyTokenConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2737,13 +2430,9 @@ export interface TableSharingConcurrencyTokenConvention$instance extends IModelF
 export type TableSharingConcurrencyTokenConvention = TableSharingConcurrencyTokenConvention$instance & __TableSharingConcurrencyTokenConvention$views;
 
 
-export abstract class TableValuedDbFunctionConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
-}
-
-
-export interface TableValuedDbFunctionConvention$instance extends TableValuedDbFunctionConvention$protected, IConvention {
+export interface TableValuedDbFunctionConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    readonly RelationalDependencies: RelationalConventionSetBuilderDependencies;
     ProcessModelFinalizing(modelBuilder: IConventionModelBuilder, context: IConventionContext_1<IConventionModelBuilder>): void;
 }
 
@@ -2762,15 +2451,9 @@ export interface TableValuedDbFunctionConvention$instance extends IModelFinalizi
 export type TableValuedDbFunctionConvention = TableValuedDbFunctionConvention$instance & __TableValuedDbFunctionConvention$views;
 
 
-export abstract class TimestampAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: TimestampAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface TimestampAttributeConvention$instance extends TimestampAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<TimestampAttribute>, IConvention {
+export interface TimestampAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<TimestampAttribute>, IConvention {
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: TimestampAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2788,22 +2471,17 @@ export interface __TimestampAttributeConvention$views {
 export type TimestampAttributeConvention = TimestampAttributeConvention$instance & __TimestampAttributeConvention$views;
 
 
-export abstract class TypeAttributeConventionBase_1$protected<TAttribute extends Attribute> {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: TAttribute, context: IConventionContext): void;
-    protected abstract ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: TAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
-    protected ReplaceWithEntityType(complexTypeBuilder: IConventionComplexTypeBuilder, shouldBeOwned?: Nullable<System_Internal.Boolean>): IConventionEntityTypeBuilder | undefined;
-}
-
-
-export interface TypeAttributeConventionBase_1$instance<TAttribute extends Attribute> extends TypeAttributeConventionBase_1$protected<TAttribute>, IConvention {
+export interface TypeAttributeConventionBase_1$instance<TAttribute extends Attribute> extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
     ProcessComplexPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, context: IConventionContext_1<IConventionComplexPropertyBuilder>): void;
+    ProcessComplexTypeAdded(complexTypeBuilder: IConventionComplexTypeBuilder, attribute: TAttribute, context: IConventionContext): void;
     ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
+    ProcessEntityTypeAdded(entityTypeBuilder: IConventionEntityTypeBuilder, attribute: TAttribute, context: IConventionContext_1<IConventionEntityTypeBuilder>): void;
+    ReplaceWithEntityType(complexTypeBuilder: IConventionComplexTypeBuilder, shouldBeOwned?: Nullable<System_Internal.Boolean>): IConventionEntityTypeBuilder | undefined;
 }
 
 
-export const TypeAttributeConventionBase_1: {
-    new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies): TypeAttributeConventionBase_1<TAttribute>;
+export const TypeAttributeConventionBase_1: (abstract new<TAttribute extends Attribute>(dependencies: ProviderConventionSetBuilderDependencies) => TypeAttributeConventionBase_1<TAttribute>) & {
 };
 
 
@@ -2814,15 +2492,9 @@ export interface __TypeAttributeConventionBase_1$views<TAttribute extends Attrib
 export type TypeAttributeConventionBase_1<TAttribute extends Attribute> = TypeAttributeConventionBase_1$instance<TAttribute> & __TypeAttributeConventionBase_1$views<TAttribute>;
 
 
-export abstract class UnicodeAttributeConvention$protected {
-    protected ProcessPropertyAdded4(propertyBuilder: IConventionPropertyBuilder, attribute: UnicodeAttribute, clrMember: MemberInfo, context: IConventionContext): void;
-    protected abstract ProcessPropertyAdded2(propertyBuilder: IConventionPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-    protected ProcessPropertyAdded3(propertyBuilder: IConventionComplexPropertyBuilder, attribute: unknown, clrMember: MemberInfo, context: IConventionContext): void;
-}
-
-
-export interface UnicodeAttributeConvention$instance extends UnicodeAttributeConvention$protected, PropertyAttributeConventionBase_1$instance<UnicodeAttribute>, IConvention {
+export interface UnicodeAttributeConvention$instance extends PropertyAttributeConventionBase_1$instance<UnicodeAttribute>, IConvention {
     ProcessPropertyAdded(propertyBuilder: IConventionPropertyBuilder, context: IConventionContext_1<IConventionPropertyBuilder>): void;
+    ProcessPropertyAdded(propertyBuilder: IConventionComplexPropertyBuilder, attribute: UnicodeAttribute, clrMember: MemberInfo, context: IConventionContext): void;
     ProcessPropertyFieldChanged(propertyBuilder: IConventionPropertyBuilder, newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo, context: IConventionContext_1<FieldInfo>): void;
 }
 
@@ -2840,13 +2512,9 @@ export interface __UnicodeAttributeConvention$views {
 export type UnicodeAttributeConvention = UnicodeAttributeConvention$instance & __UnicodeAttributeConvention$views;
 
 
-export abstract class ValueGenerationConvention$protected {
-    protected readonly Dependencies: ProviderConventionSetBuilderDependencies;
-    protected GetValueGenerated(property: IConventionProperty): Nullable<ValueGenerated>;
-}
-
-
-export interface ValueGenerationConvention$instance extends ValueGenerationConvention$protected, IConvention {
+export interface ValueGenerationConvention$instance extends IConvention {
+    readonly Dependencies: ProviderConventionSetBuilderDependencies;
+    GetValueGenerated(property: IConventionProperty): Nullable<ValueGenerated>;
     ProcessEntityTypeBaseTypeChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newBaseType: IConventionEntityType, oldBaseType: IConventionEntityType, context: IConventionContext_1<IConventionEntityType>): void;
     ProcessEntityTypePrimaryKeyChanged(entityTypeBuilder: IConventionEntityTypeBuilder, newPrimaryKey: IConventionKey, previousPrimaryKey: IConventionKey, context: IConventionContext_1<IConventionKey>): void;
     ProcessForeignKeyAdded(relationshipBuilder: IConventionForeignKeyBuilder, context: IConventionContext_1<IConventionForeignKeyBuilder>): void;