@tsonic/efcore 10.0.2 → 10.0.5

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

@@ -28,6 +28,8 @@ import type { Expression, LambdaExpression } from "@tsonic/dotnet/System.Linq.Ex
 import type { FieldInfo, MemberInfo } from "@tsonic/dotnet/System.Reflection.js";
 
 export interface IConventionAnnotatableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
+
     readonly Metadata: IConventionAnnotatable;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -40,6 +42,8 @@ export interface IConventionAnnotatableBuilder$instance {
 export type IConventionAnnotatableBuilder = IConventionAnnotatableBuilder$instance;
 
 export interface IConventionCheckConstraintBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionCheckConstraintBuilder: never;
+
     readonly Metadata: IConventionCheckConstraint;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -55,6 +59,8 @@ export interface IConventionCheckConstraintBuilder$instance extends IConventionA
 export type IConventionCheckConstraintBuilder = IConventionCheckConstraintBuilder$instance;
 
 export interface IConventionComplexPropertyBuilder$instance extends IConventionPropertyBaseBuilder_1<IConventionComplexPropertyBuilder>, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionComplexPropertyBuilder: never;
+
     readonly Metadata: IConventionComplexProperty;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -79,6 +85,8 @@ export interface IConventionComplexPropertyBuilder$instance extends IConventionP
 export type IConventionComplexPropertyBuilder = IConventionComplexPropertyBuilder$instance;
 
 export interface IConventionComplexTypeBuilder$instance extends IConventionTypeBaseBuilder, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionComplexTypeBuilder: never;
+
     readonly Metadata: IConventionComplexType;
     readonly ModelBuilder: IConventionModelBuilder;
     CanHaveComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): boolean;
@@ -129,6 +137,8 @@ export interface IConventionComplexTypeBuilder$instance extends IConventionTypeB
 export type IConventionComplexTypeBuilder = IConventionComplexTypeBuilder$instance;
 
 export interface IConventionComplexTypeDiscriminatorBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionComplexTypeDiscriminatorBuilder: never;
+
     readonly ComplexType: IConventionComplexType;
     CanSetValue(value: unknown, fromDataAnnotation?: boolean): boolean;
     HasValue(value: unknown, fromDataAnnotation?: boolean): IConventionComplexTypeDiscriminatorBuilder | undefined;
@@ -138,6 +148,8 @@ export interface IConventionComplexTypeDiscriminatorBuilder$instance {
 export type IConventionComplexTypeDiscriminatorBuilder = IConventionComplexTypeDiscriminatorBuilder$instance;
 
 export interface IConventionDbFunctionBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDbFunctionBuilder: never;
+
     readonly Metadata: IConventionDbFunction;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -160,6 +172,8 @@ export interface IConventionDbFunctionBuilder$instance extends IConventionAnnota
 export type IConventionDbFunctionBuilder = IConventionDbFunctionBuilder$instance;
 
 export interface IConventionDbFunctionParameterBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDbFunctionParameterBuilder: never;
+
     readonly Metadata: IConventionDbFunctionParameter;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -177,6 +191,8 @@ export interface IConventionDbFunctionParameterBuilder$instance extends IConvent
 export type IConventionDbFunctionParameterBuilder = IConventionDbFunctionParameterBuilder$instance;
 
 export interface IConventionDiscriminatorBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDiscriminatorBuilder: never;
+
     readonly EntityType: IConventionEntityType;
     CanSetIsComplete(complete: boolean, fromDataAnnotation?: boolean): boolean;
     CanSetValue(entityType: IConventionEntityType, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -190,6 +206,8 @@ export interface IConventionDiscriminatorBuilder$instance {
 export type IConventionDiscriminatorBuilder = IConventionDiscriminatorBuilder$instance;
 
 export interface IConventionElementTypeBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionElementTypeBuilder: never;
+
     readonly Metadata: IConventionElementType;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -214,6 +232,8 @@ export interface IConventionElementTypeBuilder$instance extends IConventionAnnot
 export type IConventionElementTypeBuilder = IConventionElementTypeBuilder$instance;
 
 export interface IConventionEntityTypeBuilder$instance extends IConventionTypeBaseBuilder, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionEntityTypeBuilder: never;
+
     readonly Metadata: IConventionEntityType;
     readonly ModelBuilder: IConventionModelBuilder;
     CanHaveComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): boolean;
@@ -315,6 +335,8 @@ export interface IConventionEntityTypeBuilder$instance extends IConventionTypeBa
 export type IConventionEntityTypeBuilder = IConventionEntityTypeBuilder$instance;
 
 export interface IConventionEntityTypeMappingFragmentBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionEntityTypeMappingFragmentBuilder: never;
+
     readonly Metadata: IConventionEntityTypeMappingFragment;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -327,6 +349,8 @@ export interface IConventionEntityTypeMappingFragmentBuilder$instance extends IC
 export type IConventionEntityTypeMappingFragmentBuilder = IConventionEntityTypeMappingFragmentBuilder$instance;
 
 export interface IConventionForeignKeyBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionForeignKeyBuilder: never;
+
     readonly Metadata: IConventionForeignKey;
     readonly ModelBuilder: IConventionModelBuilder;
     CanInvert(newForeignKeyProperties: IReadOnlyList<IConventionProperty>, fromDataAnnotation?: boolean): boolean;
@@ -355,6 +379,8 @@ export interface IConventionForeignKeyBuilder$instance extends IConventionAnnota
 export type IConventionForeignKeyBuilder = IConventionForeignKeyBuilder$instance;
 
 export interface IConventionIndexBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionIndexBuilder: never;
+
     readonly Metadata: IConventionIndex;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -373,6 +399,8 @@ export interface IConventionIndexBuilder$instance extends IConventionAnnotatable
 export type IConventionIndexBuilder = IConventionIndexBuilder$instance;
 
 export interface IConventionKeyBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionKeyBuilder: never;
+
     readonly Metadata: IConventionKey;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -387,6 +415,8 @@ export interface IConventionKeyBuilder$instance extends IConventionAnnotatableBu
 export type IConventionKeyBuilder = IConventionKeyBuilder$instance;
 
 export interface IConventionModelBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionModelBuilder: never;
+
     readonly Metadata: IConventionModel;
     readonly ModelBuilder: IConventionModelBuilder;
     CanHaveSharedTypeEntity(name: string, type: Type, fromDataAnnotation?: boolean): boolean;
@@ -415,6 +445,8 @@ export interface IConventionModelBuilder$instance extends IConventionAnnotatable
 export type IConventionModelBuilder = IConventionModelBuilder$instance;
 
 export interface IConventionNavigationBuilder$instance extends IConventionPropertyBaseBuilder_1<IConventionNavigationBuilder>, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionNavigationBuilder: never;
+
     readonly Metadata: IConventionNavigation;
     readonly ModelBuilder: IConventionModelBuilder;
     AutoInclude(autoInclude: Nullable<System_Internal.Boolean>, fromDataAnnotation?: boolean): IConventionNavigationBuilder | undefined;
@@ -439,12 +471,16 @@ export interface IConventionNavigationBuilder$instance extends IConventionProper
 export type IConventionNavigationBuilder = IConventionNavigationBuilder$instance;
 
 export interface IConventionOwnedEntityTypeBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionOwnedEntityTypeBuilder: never;
+
 }
 
 
 export type IConventionOwnedEntityTypeBuilder = IConventionOwnedEntityTypeBuilder$instance;
 
 export interface IConventionPropertyBaseBuilder_1$instance<TBuilder extends IConventionPropertyBaseBuilder_1<TBuilder>> extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionPropertyBaseBuilder_1: never;
+
     readonly Metadata: IConventionPropertyBase;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -464,6 +500,8 @@ export interface IConventionPropertyBaseBuilder_1$instance<TBuilder extends ICon
 export type IConventionPropertyBaseBuilder_1<TBuilder extends IConventionPropertyBaseBuilder_1<TBuilder>> = IConventionPropertyBaseBuilder_1$instance<TBuilder>;
 
 export interface IConventionPropertyBuilder$instance extends IConventionPropertyBaseBuilder_1<IConventionPropertyBuilder>, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionPropertyBuilder: never;
+
     readonly Metadata: IConventionProperty;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -501,6 +539,8 @@ export interface IConventionPropertyBuilder$instance extends IConventionProperty
 export type IConventionPropertyBuilder = IConventionPropertyBuilder$instance;
 
 export interface IConventionRelationalPropertyOverridesBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionRelationalPropertyOverridesBuilder: never;
+
     readonly Metadata: IConventionRelationalPropertyOverrides;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -513,6 +553,8 @@ export interface IConventionRelationalPropertyOverridesBuilder$instance extends
 export type IConventionRelationalPropertyOverridesBuilder = IConventionRelationalPropertyOverridesBuilder$instance;
 
 export interface IConventionSequenceBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionSequenceBuilder: never;
+
     readonly Metadata: IConventionSequence;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -531,6 +573,8 @@ export interface IConventionSequenceBuilder$instance extends IConventionAnnotata
 export type IConventionSequenceBuilder = IConventionSequenceBuilder$instance;
 
 export interface IConventionServicePropertyBuilder$instance extends IConventionPropertyBaseBuilder_1<IConventionServicePropertyBuilder>, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionServicePropertyBuilder: never;
+
     readonly Metadata: IConventionServiceProperty;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -556,6 +600,8 @@ export interface IConventionServicePropertyBuilder$instance extends IConventionP
 export type IConventionServicePropertyBuilder = IConventionServicePropertyBuilder$instance;
 
 export interface IConventionSkipNavigationBuilder$instance extends IConventionPropertyBaseBuilder_1<IConventionSkipNavigationBuilder>, IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionSkipNavigationBuilder: never;
+
     readonly Metadata: IConventionSkipNavigation;
     readonly ModelBuilder: IConventionModelBuilder;
     AutoInclude(autoInclude: Nullable<System_Internal.Boolean>, fromDataAnnotation?: boolean): IConventionSkipNavigationBuilder | undefined;
@@ -584,6 +630,8 @@ export interface IConventionSkipNavigationBuilder$instance extends IConventionPr
 export type IConventionSkipNavigationBuilder = IConventionSkipNavigationBuilder$instance;
 
 export interface IConventionStoredProcedureBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionStoredProcedureBuilder: never;
+
     readonly Metadata: IConventionStoredProcedure;
     readonly ModelBuilder: IConventionModelBuilder;
     CanHaveRowsAffectedParameter(fromDataAnnotation?: boolean): boolean;
@@ -594,7 +642,7 @@ export interface IConventionStoredProcedureBuilder$instance extends IConventionA
     HasName(name: string, schema: string, fromDataAnnotation?: boolean): IConventionStoredProcedureBuilder | undefined;
     HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionStoredProcedureBuilder | undefined;
-    HasParameter(propertyName: string, fromDataAnnotation?: boolean): IConventionStoredProcedureParameterBuilder;
+    HasParameter(propertyName: string, fromDataAnnotation?: boolean): IConventionStoredProcedureParameterBuilder | undefined;
     HasResultColumn(propertyName: string, fromDataAnnotation?: boolean): IConventionStoredProcedureResultColumnBuilder | undefined;
     HasRowsAffectedParameter(fromDataAnnotation?: boolean): IConventionStoredProcedureParameterBuilder | undefined;
     HasRowsAffectedResultColumn(fromDataAnnotation?: boolean): IConventionStoredProcedureResultColumnBuilder | undefined;
@@ -605,6 +653,8 @@ export interface IConventionStoredProcedureBuilder$instance extends IConventionA
 export type IConventionStoredProcedureBuilder = IConventionStoredProcedureBuilder$instance;
 
 export interface IConventionStoredProcedureParameterBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionStoredProcedureParameterBuilder: never;
+
     readonly Metadata: IConventionStoredProcedureParameter;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -622,6 +672,8 @@ export interface IConventionStoredProcedureParameterBuilder$instance extends ICo
 export type IConventionStoredProcedureParameterBuilder = IConventionStoredProcedureParameterBuilder$instance;
 
 export interface IConventionStoredProcedureResultColumnBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionStoredProcedureResultColumnBuilder: never;
+
     readonly Metadata: IConventionStoredProcedureResultColumn;
     readonly ModelBuilder: IConventionModelBuilder;
     CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
@@ -637,6 +689,8 @@ export interface IConventionStoredProcedureResultColumnBuilder$instance extends
 export type IConventionStoredProcedureResultColumnBuilder = IConventionStoredProcedureResultColumnBuilder$instance;
 
 export interface IConventionTriggerBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionTriggerBuilder: never;
+
     readonly Metadata: IConventionTrigger;
     readonly ModelBuilder: IConventionModelBuilder;
     CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
@@ -651,6 +705,8 @@ export interface IConventionTriggerBuilder$instance extends IConventionAnnotatab
 export type IConventionTriggerBuilder = IConventionTriggerBuilder$instance;
 
 export interface IConventionTypeBaseBuilder$instance extends IConventionAnnotatableBuilder {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionTypeBaseBuilder: never;
+
     readonly Metadata: IConventionTypeBase;
     readonly ModelBuilder: IConventionModelBuilder;
     CanHaveComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): boolean;
@@ -686,12 +742,10 @@ export interface IConventionTypeBaseBuilder$instance extends IConventionAnnotata
 
 export type IConventionTypeBaseBuilder = IConventionTypeBaseBuilder$instance;
 
-export abstract class CheckConstraintBuilder$protected {
-    protected readonly Builder: InternalCheckConstraintBuilder;
-}
-
+export interface CheckConstraintBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface CheckConstraintBuilder$instance extends CheckConstraintBuilder$protected {
+    readonly Builder: InternalCheckConstraintBuilder;
     readonly Metadata: IMutableCheckConstraint;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -715,16 +769,11 @@ export interface CheckConstraintBuilder$instance extends Microsoft_EntityFramewo
 export type CheckConstraintBuilder = CheckConstraintBuilder$instance & __CheckConstraintBuilder$views;
 
 
-export abstract class CollectionCollectionBuilder$protected {
-    protected readonly LeftEntityType: IMutableEntityType;
-    protected readonly ModelBuilder: InternalModelBuilder;
-    protected readonly RightEntityType: IMutableEntityType;
-    protected UsingEntity(joinEntityName: string, joinEntityType: Type, configureRight: Func<IMutableEntityType, IMutableForeignKey>, configureLeft: Func<IMutableEntityType, IMutableForeignKey>): IMutableEntityType;
-}
-
-
-export interface CollectionCollectionBuilder$instance extends CollectionCollectionBuilder$protected {
+export interface CollectionCollectionBuilder$instance {
+    readonly LeftEntityType: IMutableEntityType;
     readonly LeftNavigation: IMutableSkipNavigation;
+    readonly ModelBuilder: InternalModelBuilder;
+    readonly RightEntityType: IMutableEntityType;
     readonly RightNavigation: IMutableSkipNavigation;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -744,6 +793,7 @@ export interface CollectionCollectionBuilder$instance extends CollectionCollecti
     UsingEntity(joinEntityType: Type, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
     UsingEntity(joinEntityName: string, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
     UsingEntity(joinEntityName: string, joinEntityType: Type, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
+    UsingEntity(joinEntityName: string, joinEntityType: Type, configureRight: Func<IMutableEntityType, IMutableForeignKey>, configureLeft: Func<IMutableEntityType, IMutableForeignKey>): IMutableEntityType;
 }
 
 
@@ -754,12 +804,7 @@ export const CollectionCollectionBuilder: {
 
 export type CollectionCollectionBuilder = CollectionCollectionBuilder$instance;
 
-export abstract class CollectionCollectionBuilder_2$protected<TLeftEntity, TRightEntity> {
-    protected UsingEntity16(joinEntityName: string, joinEntityType: Type, configureRight: Func<IMutableEntityType, IMutableForeignKey>, configureLeft: Func<IMutableEntityType, IMutableForeignKey>): IMutableEntityType;
-}
-
-
-export interface CollectionCollectionBuilder_2$instance<TLeftEntity, TRightEntity> extends CollectionCollectionBuilder_2$protected<TLeftEntity, TRightEntity>, CollectionCollectionBuilder {
+export interface CollectionCollectionBuilder_2$instance<TLeftEntity, TRightEntity> extends CollectionCollectionBuilder {
     UsingEntity<TJoinEntity>(): EntityTypeBuilder_1<TJoinEntity>;
     UsingEntity<TJoinEntity>(joinEntityName: string): EntityTypeBuilder_1<TJoinEntity>;
     UsingEntity(configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder_1<TRightEntity>;
@@ -791,6 +836,7 @@ export interface CollectionCollectionBuilder_2$instance<TLeftEntity, TRightEntit
     UsingEntity(joinEntityType: Type, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
     UsingEntity(joinEntityName: string, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
     UsingEntity(joinEntityName: string, joinEntityType: Type, configureRight: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureLeft: Func<EntityTypeBuilder, ReferenceCollectionBuilder>, configureJoinEntityType: Action<EntityTypeBuilder>): EntityTypeBuilder;
+    UsingEntity(joinEntityName: string, joinEntityType: Type, configureRight: Func<IMutableEntityType, IMutableForeignKey>, configureLeft: Func<IMutableEntityType, IMutableForeignKey>): IMutableEntityType;
 }
 
 
@@ -801,27 +847,26 @@ export const CollectionCollectionBuilder_2: {
 
 export type CollectionCollectionBuilder_2<TLeftEntity, TRightEntity> = CollectionCollectionBuilder_2$instance<TLeftEntity, TRightEntity>;
 
-export abstract class CollectionNavigationBuilder$protected {
-    protected Builder: InternalForeignKeyBuilder;
-    protected readonly CollectionMember: MemberInfo | undefined;
-    protected readonly CollectionName: string | undefined;
-    protected readonly DeclaringEntityType: IMutableEntityType;
-    protected readonly RelatedEntityType: IMutableEntityType;
-    protected WithLeftManyNavigation(inverseMemberInfo: MemberInfo): IMutableSkipNavigation;
-    protected WithLeftManyNavigation(inverseName: string): IMutableSkipNavigation;
-    protected WithOneBuilder(navigationName: string): InternalForeignKeyBuilder;
-    protected WithOneBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
-    protected WithRightManyNavigation(navigationName: string, inverseName: string): IMutableSkipNavigation;
-    protected WithRightManyNavigation(navigationMemberInfo: MemberInfo, inverseName: string): IMutableSkipNavigation;
-}
-
+export interface CollectionNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface CollectionNavigationBuilder$instance extends CollectionNavigationBuilder$protected {
+    get Builder(): InternalForeignKeyBuilder | undefined;
+    set Builder(value: InternalForeignKeyBuilder | undefined);
+    readonly CollectionMember: MemberInfo | undefined;
+    readonly CollectionName: string | undefined;
+    readonly DeclaringEntityType: IMutableEntityType;
+    readonly RelatedEntityType: IMutableEntityType;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     ToString(): string | undefined;
+    WithLeftManyNavigation(inverseMemberInfo: MemberInfo): IMutableSkipNavigation;
+    WithLeftManyNavigation(inverseName: string): IMutableSkipNavigation;
     WithMany(navigationName?: string): CollectionCollectionBuilder;
     WithOne(navigationName?: string): ReferenceCollectionBuilder;
+    WithOneBuilder(navigationName: string): InternalForeignKeyBuilder;
+    WithOneBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
+    WithRightManyNavigation(navigationName: string, inverseName: string): IMutableSkipNavigation;
+    WithRightManyNavigation(navigationMemberInfo: MemberInfo, inverseName: string): IMutableSkipNavigation;
 }
 
 
@@ -840,6 +885,8 @@ export type CollectionNavigationBuilder = CollectionNavigationBuilder$instance &
 
 
 export interface CollectionNavigationBuilder_2$instance<TEntity, TRelatedEntity> extends CollectionNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     WithMany(navigationName?: string): CollectionCollectionBuilder_2<TRelatedEntity, TEntity>;
     WithMany(navigationName?: string): CollectionCollectionBuilder;
     WithOne(navigationName?: string): ReferenceCollectionBuilder_2<TEntity, TRelatedEntity>;
@@ -861,12 +908,10 @@ export interface CollectionNavigationBuilder_2$instance<TEntity, TRelatedEntity>
 export type CollectionNavigationBuilder_2<TEntity, TRelatedEntity> = CollectionNavigationBuilder_2$instance<TEntity, TRelatedEntity> & __CollectionNavigationBuilder_2$views<TEntity, TRelatedEntity>;
 
 
-export abstract class ColumnBuilder$protected {
-    protected readonly InternalOverrides: RelationalPropertyOverrides;
-}
+export interface ColumnBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface ColumnBuilder$instance extends ColumnBuilder$protected {
+    readonly InternalOverrides: RelationalPropertyOverrides;
     readonly Overrides: IMutableRelationalPropertyOverrides;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -891,6 +936,8 @@ export type ColumnBuilder = ColumnBuilder$instance & __ColumnBuilder$views;
 
 
 export interface ColumnBuilder_1$instance<TProperty> extends ColumnBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ColumnBuilder;
     HasColumnName(name: string): ColumnBuilder;
 }
@@ -910,14 +957,12 @@ export interface ColumnBuilder_1$instance<TProperty> extends Microsoft_EntityFra
 export type ColumnBuilder_1<TProperty> = ColumnBuilder_1$instance<TProperty> & __ColumnBuilder_1$views<TProperty>;
 
 
-export abstract class ComplexCollectionBuilder$protected {
-    protected readonly PropertyBuilder: InternalComplexPropertyBuilder;
-    protected readonly TypeBuilder: InternalComplexTypeBuilder;
-}
-
+export interface ComplexCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ComplexCollectionBuilder$instance extends ComplexCollectionBuilder$protected {
     readonly Metadata: IMutableComplexProperty;
+    readonly PropertyBuilder: InternalComplexPropertyBuilder;
+    readonly TypeBuilder: InternalComplexTypeBuilder;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string, complexTypeName: string): ComplexCollectionBuilder_1<TElement>;
@@ -975,6 +1020,8 @@ export type ComplexCollectionBuilder = ComplexCollectionBuilder$instance & __Com
 
 
 export interface ComplexCollectionBuilder_1$instance<TComplex> extends ComplexCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ComplexCollection<TElement>(propertyExpression: Expression<Func<TComplex, IEnumerable<TElement>>>, complexTypeName: string): ComplexCollectionBuilder_1<TElement>;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
@@ -1030,6 +1077,8 @@ export type ComplexCollectionBuilder_1<TComplex> = ComplexCollectionBuilder_1$in
 
 
 export interface ComplexCollectionTypePropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableProperty;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1073,6 +1122,8 @@ export type ComplexCollectionTypePropertyBuilder = ComplexCollectionTypeProperty
 
 
 export interface ComplexCollectionTypePropertyBuilder_1$instance<TProperty> extends ComplexCollectionTypePropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ComplexCollectionTypePropertyBuilder;
     HasConversion(providerClrType: Type): ComplexCollectionTypePropertyBuilder_1<TProperty>;
     HasConversion<TProvider>(converter: ValueConverter_2<TProperty, TProvider>): ComplexCollectionTypePropertyBuilder_1<TProperty>;
@@ -1121,12 +1172,8 @@ export interface ComplexCollectionTypePropertyBuilder_1$instance<TProperty> exte
 export type ComplexCollectionTypePropertyBuilder_1<TProperty> = ComplexCollectionTypePropertyBuilder_1$instance<TProperty> & __ComplexCollectionTypePropertyBuilder_1$views<TProperty>;
 
 
-export abstract class ComplexPropertiesConfigurationBuilder$protected {
-    protected readonly Configuration: ComplexPropertyConfiguration;
-}
-
-
-export interface ComplexPropertiesConfigurationBuilder$instance extends ComplexPropertiesConfigurationBuilder$protected {
+export interface ComplexPropertiesConfigurationBuilder$instance {
+    readonly Configuration: ComplexPropertyConfiguration;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     ToString(): string | undefined;
@@ -1151,14 +1198,12 @@ export const ComplexPropertiesConfigurationBuilder_1: {
 
 export type ComplexPropertiesConfigurationBuilder_1<TProperty> = ComplexPropertiesConfigurationBuilder_1$instance<TProperty>;
 
-export abstract class ComplexPropertyBuilder$protected {
-    protected readonly PropertyBuilder: InternalComplexPropertyBuilder;
-    protected readonly TypeBuilder: InternalComplexTypeBuilder;
-}
-
+export interface ComplexPropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ComplexPropertyBuilder$instance extends ComplexPropertyBuilder$protected {
     readonly Metadata: IMutableComplexProperty;
+    readonly PropertyBuilder: InternalComplexPropertyBuilder;
+    readonly TypeBuilder: InternalComplexTypeBuilder;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string, complexTypeName: string): ComplexCollectionBuilder_1<TElement>;
@@ -1220,6 +1265,8 @@ export type ComplexPropertyBuilder = ComplexPropertyBuilder$instance & __Complex
 
 
 export interface ComplexPropertyBuilder_1$instance<TComplex> extends ComplexPropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ComplexCollection<TElement>(propertyExpression: Expression<Func<TComplex, IEnumerable<TElement>>>, complexTypeName: string): ComplexCollectionBuilder_1<TElement>;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
@@ -1278,12 +1325,10 @@ export interface ComplexPropertyBuilder_1$instance<TComplex> extends Microsoft_E
 export type ComplexPropertyBuilder_1<TComplex> = ComplexPropertyBuilder_1$instance<TComplex> & __ComplexPropertyBuilder_1$views<TComplex>;
 
 
-export abstract class ComplexTypeDiscriminatorBuilder$protected {
-    protected readonly ComplexTypeBuilder: InternalComplexTypeBuilder;
-}
-
+export interface ComplexTypeDiscriminatorBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionComplexTypeDiscriminatorBuilder: never;
 
-export interface ComplexTypeDiscriminatorBuilder$instance extends ComplexTypeDiscriminatorBuilder$protected {
+    readonly ComplexTypeBuilder: InternalComplexTypeBuilder;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasValue(value: unknown): ComplexTypeDiscriminatorBuilder;
@@ -1316,6 +1361,8 @@ export const ComplexTypeDiscriminatorBuilder_1: {
 export type ComplexTypeDiscriminatorBuilder_1<TDiscriminator> = ComplexTypeDiscriminatorBuilder_1$instance<TDiscriminator>;
 
 export interface ComplexTypePrimitiveCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableProperty;
     ElementType(): ElementTypeBuilder;
     ElementType(builderAction: Action<ElementTypeBuilder>): ComplexTypePrimitiveCollectionBuilder;
@@ -1357,6 +1404,8 @@ export type ComplexTypePrimitiveCollectionBuilder = ComplexTypePrimitiveCollecti
 
 
 export interface ComplexTypePrimitiveCollectionBuilder_1$instance<TProperty> extends ComplexTypePrimitiveCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ElementType(): ElementTypeBuilder;
     ElementType(builderAction: Action<ElementTypeBuilder>): ComplexTypePrimitiveCollectionBuilder;
     HasAnnotation(annotation: string, value: unknown): ComplexTypePrimitiveCollectionBuilder;
@@ -1395,6 +1444,8 @@ export type ComplexTypePrimitiveCollectionBuilder_1<TProperty> = ComplexTypePrim
 
 
 export interface ComplexTypePropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableProperty;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1448,6 +1499,8 @@ export type ComplexTypePropertyBuilder = ComplexTypePropertyBuilder$instance & _
 
 
 export interface ComplexTypePropertyBuilder_1$instance<TProperty> extends ComplexTypePropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ComplexTypePropertyBuilder;
     HasConversion(providerClrType: Type): ComplexTypePropertyBuilder_1<TProperty>;
     HasConversion<TProvider>(converter: ValueConverter_2<TProperty, TProvider>): ComplexTypePropertyBuilder_1<TProperty>;
@@ -1550,6 +1603,8 @@ export const DataBuilder_1: {
 export type DataBuilder_1<TEntity> = DataBuilder_1$instance<TEntity>;
 
 export interface DbFunctionBuilder$instance extends DbFunctionBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): DbFunctionBuilder;
     HasName(name: string): DbFunctionBuilderBase;
     HasParameter(name: string): DbFunctionParameterBuilder;
@@ -1576,12 +1631,10 @@ export interface DbFunctionBuilder$instance extends Microsoft_EntityFrameworkCor
 export type DbFunctionBuilder = DbFunctionBuilder$instance & __DbFunctionBuilder$views;
 
 
-export abstract class DbFunctionBuilderBase$protected {
-    protected readonly Builder: InternalDbFunctionBuilder;
-}
+export interface DbFunctionBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface DbFunctionBuilderBase$instance extends DbFunctionBuilderBase$protected {
+    readonly Builder: InternalDbFunctionBuilder;
     readonly Metadata: IMutableDbFunction;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1594,8 +1647,7 @@ export interface DbFunctionBuilderBase$instance extends DbFunctionBuilderBase$pr
 }
 
 
-export const DbFunctionBuilderBase: {
-    new(function_: IMutableDbFunction): DbFunctionBuilderBase;
+export const DbFunctionBuilderBase: (abstract new(function_: IMutableDbFunction) => DbFunctionBuilderBase) & {
 };
 
 
@@ -1609,6 +1661,8 @@ export type DbFunctionBuilderBase = DbFunctionBuilderBase$instance & __DbFunctio
 
 
 export interface DbFunctionParameterBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableDbFunctionParameter;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1632,12 +1686,10 @@ export interface DbFunctionParameterBuilder$instance extends Microsoft_EntityFra
 export type DbFunctionParameterBuilder = DbFunctionParameterBuilder$instance & __DbFunctionParameterBuilder$views;
 
 
-export abstract class DiscriminatorBuilder$protected {
-    protected readonly EntityTypeBuilder: InternalEntityTypeBuilder;
-}
-
+export interface DiscriminatorBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDiscriminatorBuilder: never;
 
-export interface DiscriminatorBuilder$instance extends DiscriminatorBuilder$protected {
+    readonly EntityTypeBuilder: InternalEntityTypeBuilder;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasValue(value: unknown): DiscriminatorBuilder;
@@ -1676,6 +1728,8 @@ export const DiscriminatorBuilder_1: {
 export type DiscriminatorBuilder_1<TDiscriminator> = DiscriminatorBuilder_1$instance<TDiscriminator>;
 
 export interface ElementTypeBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableElementType;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1710,15 +1764,10 @@ export interface ElementTypeBuilder$instance extends Microsoft_EntityFrameworkCo
 export type ElementTypeBuilder = ElementTypeBuilder$instance & __ElementTypeBuilder$views;
 
 
-export abstract class EntityTypeBuilder$protected {
-    protected readonly Builder: InternalEntityTypeBuilder;
-    protected FindRelatedEntityType(relatedTypeName: string, navigationName: string): EntityType;
-    protected FindRelatedEntityType(relatedType: Type, navigationName: string): EntityType;
-    protected HasOneBuilder(navigationId: MemberIdentity, relatedEntityType: EntityType): ForeignKey;
-}
-
+export interface EntityTypeBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface EntityTypeBuilder$instance extends EntityTypeBuilder$protected {
+    readonly Builder: InternalEntityTypeBuilder;
     readonly Metadata: IMutableEntityType;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
@@ -1741,6 +1790,8 @@ export interface EntityTypeBuilder$instance extends EntityTypeBuilder$protected
     ComplexProperty(propertyType: Type, propertyName: string, buildAction: Action<ComplexPropertyBuilder>): EntityTypeBuilder;
     ComplexProperty(propertyType: Type, propertyName: string, complexTypeName: string, buildAction: Action<ComplexPropertyBuilder>): EntityTypeBuilder;
     Equals(obj: unknown): boolean;
+    FindRelatedEntityType(relatedTypeName: string, navigationName: string): EntityType;
+    FindRelatedEntityType(relatedType: Type, navigationName: string): EntityType;
     GetHashCode(): int;
     HasAlternateKey(...propertyNames: string[]): KeyBuilder;
     HasAnnotation(annotation: string, value: unknown): EntityTypeBuilder;
@@ -1763,6 +1814,7 @@ export interface EntityTypeBuilder$instance extends EntityTypeBuilder$protected
     HasOne(relatedTypeName: string, navigationName: string): ReferenceNavigationBuilder;
     HasOne(relatedType: Type, navigationName?: string): ReferenceNavigationBuilder;
     HasOne(navigationName: string): ReferenceNavigationBuilder;
+    HasOneBuilder(navigationId: MemberIdentity, relatedEntityType: EntityType): ForeignKey;
     HasQueryFilter(filter: LambdaExpression): EntityTypeBuilder;
     HasQueryFilter(filterKey: string, filter: LambdaExpression): EntityTypeBuilder;
     Ignore(propertyName: string): EntityTypeBuilder;
@@ -1808,6 +1860,8 @@ export type EntityTypeBuilder = EntityTypeBuilder$instance & __EntityTypeBuilder
 
 
 export interface EntityTypeBuilder_1$instance<TEntity> extends EntityTypeBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ComplexCollection<TElement>(propertyExpression: Expression<Func<TEntity, IEnumerable<TElement>>>, complexTypeName: string): ComplexCollectionBuilder_1<TElement>;
     ComplexCollection(propertyName: string): ComplexCollectionBuilder;
     ComplexCollection<TProperty extends IEnumerable<TElement>, TElement>(propertyName: string): ComplexCollectionBuilder_1<TElement>;
@@ -1917,6 +1971,8 @@ export type EntityTypeBuilder_1<TEntity> = EntityTypeBuilder_1$instance<TEntity>
 
 
 export interface IndexBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableIndex;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -1942,6 +1998,8 @@ export type IndexBuilder = IndexBuilder$instance & __IndexBuilder$views;
 
 
 export interface IndexBuilder_1$instance<T> extends IndexBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): IndexBuilder;
     IsDescending(...descending: boolean[]): IndexBuilder;
     IsUnique(unique?: boolean): IndexBuilder;
@@ -1962,24 +2020,20 @@ export interface IndexBuilder_1$instance<T> extends Microsoft_EntityFrameworkCor
 export type IndexBuilder_1<T> = IndexBuilder_1$instance<T> & __IndexBuilder_1$views<T>;
 
 
-export abstract class InvertibleRelationshipBuilderBase$protected {
-    protected Builder: InternalForeignKeyBuilder;
-    protected readonly DeclaringEntityType: IMutableEntityType;
-    protected readonly RelatedEntityType: IMutableEntityType;
-}
-
+export interface InvertibleRelationshipBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface InvertibleRelationshipBuilderBase$instance extends InvertibleRelationshipBuilderBase$protected {
+    Builder: InternalForeignKeyBuilder;
+    readonly DeclaringEntityType: IMutableEntityType;
     readonly Metadata: IMutableForeignKey;
+    readonly RelatedEntityType: IMutableEntityType;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     ToString(): string | undefined;
 }
 
 
-export const InvertibleRelationshipBuilderBase: {
-    new(declaringEntityType: IMutableEntityType, relatedEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): InvertibleRelationshipBuilderBase;
-    new(builder: InternalForeignKeyBuilder, oldBuilder: InvertibleRelationshipBuilderBase, inverted: boolean, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): InvertibleRelationshipBuilderBase;
+export const InvertibleRelationshipBuilderBase: (abstract new(declaringEntityType: IMutableEntityType, relatedEntityType: IMutableEntityType, foreignKey: IMutableForeignKey) => InvertibleRelationshipBuilderBase) & (abstract new(builder: InternalForeignKeyBuilder, oldBuilder: InvertibleRelationshipBuilderBase, inverted: boolean, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean) => InvertibleRelationshipBuilderBase) & {
 };
 
 
@@ -1993,6 +2047,8 @@ export type InvertibleRelationshipBuilderBase = InvertibleRelationshipBuilderBas
 
 
 export interface KeyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableKey;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -2016,6 +2072,8 @@ export type KeyBuilder = KeyBuilder$instance & __KeyBuilder$views;
 
 
 export interface KeyBuilder_1$instance<T> extends KeyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): KeyBuilder;
 }
 
@@ -2035,6 +2093,8 @@ export type KeyBuilder_1<T> = KeyBuilder_1$instance<T> & __KeyBuilder_1$views<T>
 
 
 export interface NavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableNavigationBase;
     AutoInclude(autoInclude?: boolean): NavigationBuilder;
     EnableLazyLoading(lazyLoadingEnabled?: boolean): NavigationBuilder;
@@ -2063,6 +2123,8 @@ export type NavigationBuilder = NavigationBuilder$instance & __NavigationBuilder
 
 
 export interface NavigationBuilder_2$instance<TSource, TTarget> extends NavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     AutoInclude(autoInclude?: boolean): NavigationBuilder;
     EnableLazyLoading(lazyLoadingEnabled?: boolean): NavigationBuilder;
     Equals(obj: unknown): boolean;
@@ -2114,20 +2176,16 @@ export const OwnedEntityTypeBuilder_1: {
 
 export type OwnedEntityTypeBuilder_1<T> = OwnedEntityTypeBuilder_1$instance<T>;
 
-export abstract class OwnedNavigationBuilder$protected {
-    protected Builder: InternalForeignKeyBuilder;
-    protected readonly DependentEntityType: EntityType;
-    protected readonly PrincipalEntityType: EntityType;
-    protected FindRelatedEntityType(relatedTypeName: string, navigationName: string): EntityType;
-    protected FindRelatedEntityType(relatedType: Type, navigationName: string): EntityType;
-    protected HasOneBuilder(navigationId: MemberIdentity, relatedEntityType: EntityType): ForeignKey;
-    protected UpdateBuilder<T>(configure: Func<T>): T;
-}
-
+export interface OwnedNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface OwnedNavigationBuilder$instance extends OwnedNavigationBuilder$protected {
+    Builder: InternalForeignKeyBuilder;
+    readonly DependentEntityType: EntityType;
     readonly Metadata: IMutableForeignKey;
     readonly OwnedEntityType: IMutableEntityType;
+    readonly PrincipalEntityType: EntityType;
+    FindRelatedEntityType(relatedTypeName: string, navigationName: string): EntityType;
+    FindRelatedEntityType(relatedType: Type, navigationName: string): EntityType;
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationBuilder;
     HasChangeTrackingStrategy(changeTrackingStrategy: ChangeTrackingStrategy): OwnedNavigationBuilder;
     HasData(...data: unknown[]): DataBuilder;
@@ -2138,6 +2196,7 @@ export interface OwnedNavigationBuilder$instance extends OwnedNavigationBuilder$
     HasOne(relatedTypeName: string, navigationName: string): ReferenceNavigationBuilder;
     HasOne(navigationName: string): ReferenceNavigationBuilder;
     HasOne(relatedType: Type, navigationName?: string): ReferenceNavigationBuilder;
+    HasOneBuilder(navigationId: MemberIdentity, relatedEntityType: EntityType): ForeignKey;
     Ignore(propertyName: string): OwnedNavigationBuilder;
     IndexerProperty<TProperty>(propertyName: string): PropertyBuilder_1<TProperty>;
     IndexerProperty(propertyType: Type, propertyName: string): PropertyBuilder;
@@ -2160,6 +2219,7 @@ export interface OwnedNavigationBuilder$instance extends OwnedNavigationBuilder$
     Property(propertyName: string): PropertyBuilder;
     Property<TProperty>(propertyName: string): PropertyBuilder_1<TProperty>;
     Property(propertyType: Type, propertyName: string): PropertyBuilder;
+    UpdateBuilder<T>(configure: Func<T>): T;
     UsePropertyAccessMode(propertyAccessMode: PropertyAccessMode): OwnedNavigationBuilder;
     WithOwner(ownerReference?: string): OwnershipBuilder;
 }
@@ -2180,6 +2240,8 @@ export type OwnedNavigationBuilder = OwnedNavigationBuilder$instance & __OwnedNa
 
 
 export interface OwnedNavigationBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationBuilder;
     HasChangeTrackingStrategy(changeTrackingStrategy: ChangeTrackingStrategy): OwnedNavigationBuilder;
     HasData(...data: TDependentEntity[]): DataBuilder_1<TDependentEntity>;
@@ -2250,16 +2312,14 @@ export interface OwnedNavigationBuilder_2$instance<TOwnerEntity, TDependentEntit
 export type OwnedNavigationBuilder_2<TOwnerEntity, TDependentEntity> = OwnedNavigationBuilder_2$instance<TOwnerEntity, TDependentEntity> & __OwnedNavigationBuilder_2$views<TOwnerEntity, TDependentEntity>;
 
 
-export abstract class OwnedNavigationSplitTableBuilder$protected {
-    protected readonly InternalMappingFragment: EntityTypeMappingFragment;
-}
-
+export interface OwnedNavigationSplitTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface OwnedNavigationSplitTableBuilder$instance extends OwnedNavigationSplitTableBuilder$protected {
+    readonly InternalMappingFragment: EntityTypeMappingFragment;
     readonly MappingFragment: IMutableEntityTypeMappingFragment;
     readonly Metadata: IMutableEntityType;
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
     Equals(obj: unknown): boolean;
     ExcludeFromMigrations(excluded?: boolean): OwnedNavigationSplitTableBuilder;
     GetHashCode(): int;
@@ -2286,6 +2346,8 @@ export type OwnedNavigationSplitTableBuilder = OwnedNavigationSplitTableBuilder$
 
 
 export interface OwnedNavigationSplitTableBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationSplitTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ExcludeFromMigrations(excluded?: boolean): OwnedNavigationSplitTableBuilder;
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationSplitTableBuilder;
     Property(propertyName: string): ColumnBuilder;
@@ -2308,9 +2370,11 @@ export type OwnedNavigationSplitTableBuilder_2<TOwnerEntity, TDependentEntity> =
 
 
 export interface OwnedNavigationSplitViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly MappingFragment: IMutableEntityTypeMappingFragment;
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationSplitViewBuilder;
@@ -2335,6 +2399,8 @@ export type OwnedNavigationSplitViewBuilder = OwnedNavigationSplitViewBuilder$in
 
 
 export interface OwnedNavigationSplitViewBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationSplitViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationSplitViewBuilder;
     Property(propertyName: string): ViewColumnBuilder;
     Property<TProperty>(propertyName: string): ViewColumnBuilder_1<TProperty>;
@@ -2355,15 +2421,13 @@ export interface OwnedNavigationSplitViewBuilder_2$instance<TOwnerEntity, TDepen
 export type OwnedNavigationSplitViewBuilder_2<TOwnerEntity, TDependentEntity> = OwnedNavigationSplitViewBuilder_2$instance<TOwnerEntity, TDependentEntity> & __OwnedNavigationSplitViewBuilder_2$views<TOwnerEntity, TDependentEntity>;
 
 
-export abstract class OwnedNavigationStoredProcedureBuilder$protected {
-    protected readonly Builder: InternalStoredProcedureBuilder;
-    protected CreatePropertyBuilder(propertyName: string): PropertyBuilder;
-    protected CreatePropertyBuilder<TDependentEntity, TProperty>(propertyExpression: Expression<Func<TDependentEntity, TProperty>>): PropertyBuilder;
-}
-
+export interface OwnedNavigationStoredProcedureBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface OwnedNavigationStoredProcedureBuilder$instance extends OwnedNavigationStoredProcedureBuilder$protected {
+    readonly Builder: InternalStoredProcedureBuilder;
     readonly Metadata: IMutableStoredProcedure;
+    CreatePropertyBuilder(propertyName: string): PropertyBuilder;
+    CreatePropertyBuilder<TDependentEntity, TProperty>(propertyExpression: Expression<Func<TDependentEntity, TProperty>>): PropertyBuilder;
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationStoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string): OwnedNavigationStoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string, buildAction: Action<StoredProcedureParameterBuilder>): OwnedNavigationStoredProcedureBuilder;
@@ -2394,6 +2458,8 @@ export type OwnedNavigationStoredProcedureBuilder = OwnedNavigationStoredProcedu
 
 
 export interface OwnedNavigationStoredProcedureBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationStoredProcedureBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationStoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string): OwnedNavigationStoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string, buildAction: Action<StoredProcedureParameterBuilder>): OwnedNavigationStoredProcedureBuilder;
@@ -2423,19 +2489,17 @@ export interface OwnedNavigationStoredProcedureBuilder_2$instance<TOwnerEntity,
 export type OwnedNavigationStoredProcedureBuilder_2<TOwnerEntity, TDependentEntity> = OwnedNavigationStoredProcedureBuilder_2$instance<TOwnerEntity, TDependentEntity> & __OwnedNavigationStoredProcedureBuilder_2$views<TOwnerEntity, TDependentEntity>;
 
 
-export abstract class OwnedNavigationTableBuilder$protected {
-    protected readonly StoreObject: Nullable<StoreObjectIdentifier>;
-    protected GetStoreObjectIdentifier(): StoreObjectIdentifier;
-}
+export interface OwnedNavigationTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface OwnedNavigationTableBuilder$instance extends OwnedNavigationTableBuilder$protected {
     readonly Metadata: IMutableEntityType;
-    readonly Name: string;
-    readonly Schema: string;
+    readonly Name: string | undefined;
+    readonly Schema: string | undefined;
+    readonly StoreObject: Nullable<StoreObjectIdentifier>;
     Equals(obj: unknown): boolean;
     ExcludeFromMigrations(excluded?: boolean): OwnedNavigationTableBuilder;
     GetHashCode(): int;
+    GetStoreObjectIdentifier(): StoreObjectIdentifier;
     HasCheckConstraint(name: string, sql: string): CheckConstraintBuilder;
     HasComment(comment: string): OwnedNavigationTableBuilder;
     HasTrigger(modelName: string): TableTriggerBuilder;
@@ -2460,6 +2524,8 @@ export type OwnedNavigationTableBuilder = OwnedNavigationTableBuilder$instance &
 
 
 export interface OwnedNavigationTableBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ExcludeFromMigrations(excluded?: boolean): OwnedNavigationTableBuilder;
     HasComment(comment: string): OwnedNavigationTableBuilder;
     Property(propertyName: string): ColumnBuilder;
@@ -2482,6 +2548,8 @@ export type OwnedNavigationTableBuilder_2<TOwnerEntity, TDependentEntity> = Owne
 
 
 export interface OwnedNavigationTableValuedFunctionBuilder$instance extends DbFunctionBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationTableValuedFunctionBuilder;
     HasName(name: string): DbFunctionBuilderBase;
     HasParameter(name: string): DbFunctionParameterBuilder;
@@ -2506,6 +2574,8 @@ export type OwnedNavigationTableValuedFunctionBuilder = OwnedNavigationTableValu
 
 
 export interface OwnedNavigationTableValuedFunctionBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationTableValuedFunctionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnedNavigationTableValuedFunctionBuilder;
     HasName(name: string): OwnedNavigationTableValuedFunctionBuilder;
     HasName(name: string): DbFunctionBuilderBase;
@@ -2533,14 +2603,12 @@ export interface OwnedNavigationTableValuedFunctionBuilder_2$instance<TOwnerEnti
 export type OwnedNavigationTableValuedFunctionBuilder_2<TOwnerEntity, TDependentEntity> = OwnedNavigationTableValuedFunctionBuilder_2$instance<TOwnerEntity, TDependentEntity> & __OwnedNavigationTableValuedFunctionBuilder_2$views<TOwnerEntity, TDependentEntity>;
 
 
-export abstract class OwnedNavigationViewBuilder$protected {
-    protected readonly StoreObject: StoreObjectIdentifier;
-}
-
+export interface OwnedNavigationViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface OwnedNavigationViewBuilder$instance extends OwnedNavigationViewBuilder$protected {
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
+    readonly StoreObject: StoreObjectIdentifier;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     Property(propertyName: string): ViewColumnBuilder;
@@ -2564,6 +2632,8 @@ export type OwnedNavigationViewBuilder = OwnedNavigationViewBuilder$instance & _
 
 
 export interface OwnedNavigationViewBuilder_2$instance<TOwnerEntity, TDependentEntity> extends OwnedNavigationViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     Property(propertyName: string): ViewColumnBuilder;
     Property<TProperty>(propertyName: string): ViewColumnBuilder_1<TProperty>;
 }
@@ -2584,6 +2654,8 @@ export type OwnedNavigationViewBuilder_2<TOwnerEntity, TDependentEntity> = Owned
 
 
 export interface OwnershipBuilder$instance extends RelationshipBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnershipBuilder;
     HasForeignKey(...foreignKeyPropertyNames: string[]): OwnershipBuilder;
     HasPrincipalKey(...keyPropertyNames: string[]): OwnershipBuilder;
@@ -2592,7 +2664,6 @@ export interface OwnershipBuilder$instance extends RelationshipBuilderBase$insta
 
 export const OwnershipBuilder: {
     new(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): OwnershipBuilder;
-    new(builder: InternalForeignKeyBuilder, oldBuilder: OwnershipBuilder, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): OwnershipBuilder;
 };
 
 
@@ -2606,6 +2677,8 @@ export type OwnershipBuilder = OwnershipBuilder$instance & __OwnershipBuilder$vi
 
 
 export interface OwnershipBuilder_2$instance<TEntity, TDependentEntity> extends OwnershipBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): OwnershipBuilder;
     HasForeignKey(...foreignKeyPropertyNames: string[]): OwnershipBuilder_2<TEntity, TDependentEntity>;
     HasForeignKey(...foreignKeyPropertyNames: string[]): OwnershipBuilder;
@@ -2616,7 +2689,6 @@ export interface OwnershipBuilder_2$instance<TEntity, TDependentEntity> extends
 
 export const OwnershipBuilder_2: {
     new<TEntity, TDependentEntity>(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): OwnershipBuilder_2<TEntity, TDependentEntity>;
-    new<TEntity, TDependentEntity>(builder: InternalForeignKeyBuilder, oldBuilder: OwnershipBuilder, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): OwnershipBuilder_2<TEntity, TDependentEntity>;
 };
 
 
@@ -2630,6 +2702,8 @@ export type OwnershipBuilder_2<TEntity, TDependentEntity> = OwnershipBuilder_2$i
 
 
 export interface PrimitiveCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableProperty;
     ElementType(): ElementTypeBuilder;
     ElementType(builderAction: Action<ElementTypeBuilder>): PrimitiveCollectionBuilder;
@@ -2671,6 +2745,8 @@ export type PrimitiveCollectionBuilder = PrimitiveCollectionBuilder$instance & _
 
 
 export interface PrimitiveCollectionBuilder_1$instance<TProperty> extends PrimitiveCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ElementType(): ElementTypeBuilder;
     ElementType(builderAction: Action<ElementTypeBuilder>): PrimitiveCollectionBuilder;
     HasAnnotation(annotation: string, value: unknown): PrimitiveCollectionBuilder;
@@ -2708,12 +2784,8 @@ export interface PrimitiveCollectionBuilder_1$instance<TProperty> extends Micros
 export type PrimitiveCollectionBuilder_1<TProperty> = PrimitiveCollectionBuilder_1$instance<TProperty> & __PrimitiveCollectionBuilder_1$views<TProperty>;
 
 
-export abstract class PropertiesConfigurationBuilder$protected {
-    protected readonly Configuration: PropertyConfiguration;
-}
-
-
-export interface PropertiesConfigurationBuilder$instance extends PropertiesConfigurationBuilder$protected {
+export interface PropertiesConfigurationBuilder$instance {
+    readonly Configuration: PropertyConfiguration;
     AreUnicode(unicode?: boolean): PropertiesConfigurationBuilder;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -2766,6 +2838,8 @@ export const PropertiesConfigurationBuilder_1: {
 export type PropertiesConfigurationBuilder_1<TProperty> = PropertiesConfigurationBuilder_1$instance<TProperty>;
 
 export interface PropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableProperty;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -2820,6 +2894,8 @@ export type PropertyBuilder = PropertyBuilder$instance & __PropertyBuilder$views
 
 
 export interface PropertyBuilder_1$instance<TProperty> extends PropertyBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): PropertyBuilder;
     HasConversion(providerClrType: Type): PropertyBuilder_1<TProperty>;
     HasConversion<TProvider>(converter: ValueConverter_2<TProperty, TProvider>): PropertyBuilder_1<TProperty>;
@@ -2880,18 +2956,16 @@ export interface PropertyBuilder_1$instance<TProperty> extends Microsoft_EntityF
 export type PropertyBuilder_1<TProperty> = PropertyBuilder_1$instance<TProperty> & __PropertyBuilder_1$views<TProperty>;
 
 
-export abstract class ReferenceCollectionBuilder$protected {
-    protected HasForeignKeyBuilder(foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
-    protected HasForeignKeyBuilder(foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
-    protected HasPrincipalKeyBuilder(keyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
-    protected HasPrincipalKeyBuilder(keyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
-}
+export interface ReferenceCollectionBuilder$instance extends RelationshipBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface ReferenceCollectionBuilder$instance extends ReferenceCollectionBuilder$protected, RelationshipBuilderBase$instance {
     HasAnnotation(annotation: string, value: unknown): ReferenceCollectionBuilder;
     HasForeignKey(...foreignKeyPropertyNames: string[]): ReferenceCollectionBuilder;
+    HasForeignKeyBuilder(foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
+    HasForeignKeyBuilder(foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
     HasPrincipalKey(...keyPropertyNames: string[]): ReferenceCollectionBuilder;
+    HasPrincipalKeyBuilder(keyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
+    HasPrincipalKeyBuilder(keyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
     IsRequired(required?: boolean): ReferenceCollectionBuilder;
     OnDelete(deleteBehavior: DeleteBehavior): ReferenceCollectionBuilder;
 }
@@ -2899,7 +2973,6 @@ export interface ReferenceCollectionBuilder$instance extends ReferenceCollection
 
 export const ReferenceCollectionBuilder: {
     new(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): ReferenceCollectionBuilder;
-    new(builder: InternalForeignKeyBuilder, oldBuilder: ReferenceCollectionBuilder, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): ReferenceCollectionBuilder;
 };
 
 
@@ -2913,6 +2986,8 @@ export type ReferenceCollectionBuilder = ReferenceCollectionBuilder$instance & _
 
 
 export interface ReferenceCollectionBuilder_2$instance<TPrincipalEntity, TDependentEntity> extends ReferenceCollectionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ReferenceCollectionBuilder;
     HasForeignKey(...foreignKeyPropertyNames: string[]): ReferenceCollectionBuilder_2<TPrincipalEntity, TDependentEntity>;
     HasForeignKey(...foreignKeyPropertyNames: string[]): ReferenceCollectionBuilder;
@@ -2925,7 +3000,6 @@ export interface ReferenceCollectionBuilder_2$instance<TPrincipalEntity, TDepend
 
 export const ReferenceCollectionBuilder_2: {
     new<TPrincipalEntity, TDependentEntity>(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): ReferenceCollectionBuilder_2<TPrincipalEntity, TDependentEntity>;
-    new<TPrincipalEntity, TDependentEntity>(builder: InternalForeignKeyBuilder, oldBuilder: ReferenceCollectionBuilder, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): ReferenceCollectionBuilder_2<TPrincipalEntity, TDependentEntity>;
 };
 
 
@@ -2938,25 +3012,23 @@ export interface ReferenceCollectionBuilder_2$instance<TPrincipalEntity, TDepend
 export type ReferenceCollectionBuilder_2<TPrincipalEntity, TDependentEntity> = ReferenceCollectionBuilder_2$instance<TPrincipalEntity, TDependentEntity> & __ReferenceCollectionBuilder_2$views<TPrincipalEntity, TDependentEntity>;
 
 
-export abstract class ReferenceNavigationBuilder$protected {
-    protected readonly Builder: InternalForeignKeyBuilder;
-    protected readonly DeclaringEntityType: IMutableEntityType;
-    protected readonly ReferenceMember: MemberInfo | undefined;
-    protected readonly ReferenceName: string | undefined;
-    protected readonly RelatedEntityType: IMutableEntityType;
-    protected WithManyBuilder(navigationName: string): InternalForeignKeyBuilder;
-    protected WithManyBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
-    protected WithOneBuilder(navigationName: string): InternalForeignKeyBuilder;
-    protected WithOneBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
-}
-
+export interface ReferenceNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ReferenceNavigationBuilder$instance extends ReferenceNavigationBuilder$protected {
+    readonly Builder: InternalForeignKeyBuilder;
+    readonly DeclaringEntityType: IMutableEntityType;
+    readonly ReferenceMember: MemberInfo | undefined;
+    readonly ReferenceName: string | undefined;
+    readonly RelatedEntityType: IMutableEntityType;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     ToString(): string | undefined;
     WithMany(collection?: string): ReferenceCollectionBuilder;
+    WithManyBuilder(navigationName: string): InternalForeignKeyBuilder;
+    WithManyBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
     WithOne(reference?: string): ReferenceReferenceBuilder;
+    WithOneBuilder(navigationName: string): InternalForeignKeyBuilder;
+    WithOneBuilder(navigationMemberInfo: MemberInfo): InternalForeignKeyBuilder;
 }
 
 
@@ -2976,6 +3048,8 @@ export type ReferenceNavigationBuilder = ReferenceNavigationBuilder$instance & _
 
 
 export interface ReferenceNavigationBuilder_2$instance<TEntity, TRelatedEntity> extends ReferenceNavigationBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     WithMany(navigationName?: string): ReferenceCollectionBuilder_2<TRelatedEntity, TEntity>;
     WithMany(collection?: string): ReferenceCollectionBuilder;
     WithOne(navigationName?: string): ReferenceReferenceBuilder_2<TEntity, TRelatedEntity>;
@@ -2998,30 +3072,27 @@ export interface ReferenceNavigationBuilder_2$instance<TEntity, TRelatedEntity>
 export type ReferenceNavigationBuilder_2<TEntity, TRelatedEntity> = ReferenceNavigationBuilder_2$instance<TEntity, TRelatedEntity> & __ReferenceNavigationBuilder_2$views<TEntity, TRelatedEntity>;
 
 
-export abstract class ReferenceReferenceBuilder$protected {
-    protected HasForeignKeyBuilder(dependentEntityType: EntityType, dependentEntityTypeName: string, foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
-    protected HasForeignKeyBuilder(dependentEntityType: EntityType, dependentEntityTypeName: string, foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
-    protected HasPrincipalKeyBuilder(principalEntityType: EntityType, principalEntityTypeName: string, foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
-    protected HasPrincipalKeyBuilder(principalEntityType: EntityType, principalEntityTypeName: string, foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
-    protected ResolveEntityType(entityTypeName: string): EntityType | undefined;
-    protected ResolveEntityType(entityType: Type): EntityType | undefined;
-}
-
+export interface ReferenceReferenceBuilder$instance extends InvertibleRelationshipBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ReferenceReferenceBuilder$instance extends ReferenceReferenceBuilder$protected, InvertibleRelationshipBuilderBase$instance {
     HasAnnotation(annotation: string, value: unknown): ReferenceReferenceBuilder;
     HasForeignKey(dependentEntityTypeName: string, ...foreignKeyPropertyNames: string[]): ReferenceReferenceBuilder;
     HasForeignKey(dependentEntityType: Type, ...foreignKeyPropertyNames: string[]): ReferenceReferenceBuilder;
+    HasForeignKeyBuilder(dependentEntityType: EntityType, dependentEntityTypeName: string, foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
+    HasForeignKeyBuilder(dependentEntityType: EntityType, dependentEntityTypeName: string, foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
     HasPrincipalKey(principalEntityTypeName: string, ...keyPropertyNames: string[]): ReferenceReferenceBuilder;
     HasPrincipalKey(principalEntityType: Type, ...keyPropertyNames: string[]): ReferenceReferenceBuilder;
+    HasPrincipalKeyBuilder(principalEntityType: EntityType, principalEntityTypeName: string, foreignKeyPropertyNames: IReadOnlyList<System_Internal.String>): InternalForeignKeyBuilder;
+    HasPrincipalKeyBuilder(principalEntityType: EntityType, principalEntityTypeName: string, foreignKeyMembers: IReadOnlyList<MemberInfo>): InternalForeignKeyBuilder;
     IsRequired(required?: boolean): ReferenceReferenceBuilder;
     OnDelete(deleteBehavior: DeleteBehavior): ReferenceReferenceBuilder;
+    ResolveEntityType(entityTypeName: string): EntityType | undefined;
+    ResolveEntityType(entityType: Type): EntityType | undefined;
 }
 
 
 export const ReferenceReferenceBuilder: {
     new(declaringEntityType: IMutableEntityType, relatedEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): ReferenceReferenceBuilder;
-    new(builder: InternalForeignKeyBuilder, oldBuilder: ReferenceReferenceBuilder, inverted: boolean, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): ReferenceReferenceBuilder;
 };
 
 
@@ -3035,6 +3106,8 @@ export type ReferenceReferenceBuilder = ReferenceReferenceBuilder$instance & __R
 
 
 export interface ReferenceReferenceBuilder_2$instance<TEntity, TRelatedEntity> extends ReferenceReferenceBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ReferenceReferenceBuilder;
     HasForeignKey(dependentEntityType: Type, ...foreignKeyPropertyNames: string[]): ReferenceReferenceBuilder_2<TEntity, TRelatedEntity>;
     HasForeignKey<TDependentEntity>(...foreignKeyPropertyNames: string[]): ReferenceReferenceBuilder_2<TEntity, TRelatedEntity>;
@@ -3051,7 +3124,6 @@ export interface ReferenceReferenceBuilder_2$instance<TEntity, TRelatedEntity> e
 
 export const ReferenceReferenceBuilder_2: {
     new<TEntity, TRelatedEntity>(declaringEntityType: IMutableEntityType, relatedEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): ReferenceReferenceBuilder_2<TEntity, TRelatedEntity>;
-    new<TEntity, TRelatedEntity>(builder: InternalForeignKeyBuilder, oldBuilder: ReferenceReferenceBuilder, inverted: boolean, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): ReferenceReferenceBuilder_2<TEntity, TRelatedEntity>;
 };
 
 
@@ -3064,24 +3136,20 @@ export interface ReferenceReferenceBuilder_2$instance<TEntity, TRelatedEntity> e
 export type ReferenceReferenceBuilder_2<TEntity, TRelatedEntity> = ReferenceReferenceBuilder_2$instance<TEntity, TRelatedEntity> & __ReferenceReferenceBuilder_2$views<TEntity, TRelatedEntity>;
 
 
-export abstract class RelationshipBuilderBase$protected {
-    protected Builder: InternalForeignKeyBuilder;
-    protected readonly DependentEntityType: IMutableEntityType;
-    protected readonly PrincipalEntityType: IMutableEntityType;
-}
-
+export interface RelationshipBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface RelationshipBuilderBase$instance extends RelationshipBuilderBase$protected {
+    Builder: InternalForeignKeyBuilder;
+    readonly DependentEntityType: IMutableEntityType;
     readonly Metadata: IMutableForeignKey;
+    readonly PrincipalEntityType: IMutableEntityType;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     ToString(): string | undefined;
 }
 
 
-export const RelationshipBuilderBase: {
-    new(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey): RelationshipBuilderBase;
-    new(builder: InternalForeignKeyBuilder, oldBuilder: RelationshipBuilderBase, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean): RelationshipBuilderBase;
+export const RelationshipBuilderBase: (abstract new(principalEntityType: IMutableEntityType, dependentEntityType: IMutableEntityType, foreignKey: IMutableForeignKey) => RelationshipBuilderBase) & (abstract new(builder: InternalForeignKeyBuilder, oldBuilder: RelationshipBuilderBase, foreignKeySet: boolean, principalKeySet: boolean, requiredSet: boolean) => RelationshipBuilderBase) & {
 };
 
 
@@ -3095,6 +3163,8 @@ export type RelationshipBuilderBase = RelationshipBuilderBase$instance & __Relat
 
 
 export interface SequenceBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly Metadata: IMutableSequence;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -3122,16 +3192,14 @@ export interface SequenceBuilder$instance extends Microsoft_EntityFrameworkCore_
 export type SequenceBuilder = SequenceBuilder$instance & __SequenceBuilder$views;
 
 
-export abstract class SplitTableBuilder$protected {
-    protected readonly InternalMappingFragment: EntityTypeMappingFragment;
-}
+export interface SplitTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface SplitTableBuilder$instance extends SplitTableBuilder$protected {
+    readonly InternalMappingFragment: EntityTypeMappingFragment;
     readonly MappingFragment: IMutableEntityTypeMappingFragment;
     readonly Metadata: IMutableEntityType;
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
     Equals(obj: unknown): boolean;
     ExcludeFromMigrations(excluded?: boolean): SplitTableBuilder;
     GetHashCode(): int;
@@ -3158,6 +3226,8 @@ export type SplitTableBuilder = SplitTableBuilder$instance & __SplitTableBuilder
 
 
 export interface SplitTableBuilder_1$instance<TEntity> extends SplitTableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ExcludeFromMigrations(excluded?: boolean): SplitTableBuilder;
     HasAnnotation(annotation: string, value: unknown): SplitTableBuilder;
     Property(propertyName: string): ColumnBuilder;
@@ -3180,9 +3250,11 @@ export type SplitTableBuilder_1<TEntity> = SplitTableBuilder_1$instance<TEntity>
 
 
 export interface SplitViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     readonly MappingFragment: IMutableEntityTypeMappingFragment;
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasAnnotation(annotation: string, value: unknown): SplitViewBuilder;
@@ -3207,6 +3279,8 @@ export type SplitViewBuilder = SplitViewBuilder$instance & __SplitViewBuilder$vi
 
 
 export interface SplitViewBuilder_1$instance<TEntity> extends SplitViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): SplitViewBuilder;
     Property(propertyName: string): ViewColumnBuilder;
     Property<TProperty>(propertyName: string): ViewColumnBuilder_1<TProperty>;
@@ -3227,15 +3301,13 @@ export interface SplitViewBuilder_1$instance<TEntity> extends Microsoft_EntityFr
 export type SplitViewBuilder_1<TEntity> = SplitViewBuilder_1$instance<TEntity> & __SplitViewBuilder_1$views<TEntity>;
 
 
-export abstract class StoredProcedureBuilder$protected {
-    protected readonly Builder: InternalStoredProcedureBuilder;
-    protected CreatePropertyBuilder(propertyName: string): PropertyBuilder;
-    protected CreatePropertyBuilder<TDerivedEntity, TProperty>(propertyExpression: Expression<Func<TDerivedEntity, TProperty>>): PropertyBuilder;
-}
+export interface StoredProcedureBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-
-export interface StoredProcedureBuilder$instance extends StoredProcedureBuilder$protected {
+    readonly Builder: InternalStoredProcedureBuilder;
     readonly Metadata: IMutableStoredProcedure;
+    CreatePropertyBuilder(propertyName: string): PropertyBuilder;
+    CreatePropertyBuilder<TDerivedEntity, TProperty>(propertyExpression: Expression<Func<TDerivedEntity, TProperty>>): PropertyBuilder;
     HasAnnotation(annotation: string, value: unknown): StoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string): StoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string, buildAction: Action<StoredProcedureParameterBuilder>): StoredProcedureBuilder;
@@ -3266,6 +3338,8 @@ export type StoredProcedureBuilder = StoredProcedureBuilder$instance & __StoredP
 
 
 export interface StoredProcedureBuilder_1$instance<TEntity> extends StoredProcedureBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): StoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string): StoredProcedureBuilder;
     HasOriginalValueParameter(propertyName: string, buildAction: Action<StoredProcedureParameterBuilder>): StoredProcedureBuilder;
@@ -3295,12 +3369,10 @@ export interface StoredProcedureBuilder_1$instance<TEntity> extends Microsoft_En
 export type StoredProcedureBuilder_1<TEntity> = StoredProcedureBuilder_1$instance<TEntity> & __StoredProcedureBuilder_1$views<TEntity>;
 
 
-export abstract class StoredProcedureParameterBuilder$protected {
-    protected readonly Builder: InternalStoredProcedureParameterBuilder;
-}
-
+export interface StoredProcedureParameterBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface StoredProcedureParameterBuilder$instance extends StoredProcedureParameterBuilder$protected {
+    readonly Builder: InternalStoredProcedureParameterBuilder;
     readonly Metadata: IMutableStoredProcedureParameter;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -3326,12 +3398,10 @@ export interface StoredProcedureParameterBuilder$instance extends Microsoft_Enti
 export type StoredProcedureParameterBuilder = StoredProcedureParameterBuilder$instance & __StoredProcedureParameterBuilder$views;
 
 
-export abstract class StoredProcedureResultColumnBuilder$protected {
-    protected readonly Builder: InternalStoredProcedureResultColumnBuilder;
-}
-
+export interface StoredProcedureResultColumnBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface StoredProcedureResultColumnBuilder$instance extends StoredProcedureResultColumnBuilder$protected {
+    readonly Builder: InternalStoredProcedureResultColumnBuilder;
     readonly Metadata: IMutableStoredProcedureResultColumn;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -3355,19 +3425,17 @@ export interface StoredProcedureResultColumnBuilder$instance extends Microsoft_E
 export type StoredProcedureResultColumnBuilder = StoredProcedureResultColumnBuilder$instance & __StoredProcedureResultColumnBuilder$views;
 
 
-export abstract class TableBuilder$protected {
-    protected readonly StoreObject: Nullable<StoreObjectIdentifier>;
-    protected GetStoreObjectIdentifier(): StoreObjectIdentifier;
-}
-
+export interface TableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface TableBuilder$instance extends TableBuilder$protected {
     readonly Metadata: IMutableEntityType;
-    readonly Name: string;
-    readonly Schema: string;
+    readonly Name: string | undefined;
+    readonly Schema: string | undefined;
+    readonly StoreObject: Nullable<StoreObjectIdentifier>;
     Equals(obj: unknown): boolean;
     ExcludeFromMigrations(excluded?: boolean): TableBuilder;
     GetHashCode(): int;
+    GetStoreObjectIdentifier(): StoreObjectIdentifier;
     HasCheckConstraint(name: string, sql: string): CheckConstraintBuilder;
     HasComment(comment: string): TableBuilder;
     HasTrigger(modelName: string): TableTriggerBuilder;
@@ -3392,6 +3460,8 @@ export type TableBuilder = TableBuilder$instance & __TableBuilder$views;
 
 
 export interface TableBuilder_1$instance<TEntity> extends TableBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     ExcludeFromMigrations(excluded?: boolean): TableBuilder;
     HasComment(comment: string): TableBuilder;
     Property(propertyName: string): ColumnBuilder;
@@ -3414,6 +3484,8 @@ export type TableBuilder_1<TEntity> = TableBuilder_1$instance<TEntity> & __Table
 
 
 export interface TableTriggerBuilder$instance extends TriggerBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasAnnotation(annotation: string, value: unknown): TriggerBuilder;
@@ -3437,6 +3509,8 @@ export type TableTriggerBuilder = TableTriggerBuilder$instance & __TableTriggerB
 
 
 export interface TableValuedFunctionBuilder$instance extends DbFunctionBuilderBase$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): TableValuedFunctionBuilder;
     HasName(name: string): DbFunctionBuilderBase;
     HasParameter(name: string): DbFunctionParameterBuilder;
@@ -3461,6 +3535,8 @@ export type TableValuedFunctionBuilder = TableValuedFunctionBuilder$instance & _
 
 
 export interface TableValuedFunctionBuilder_1$instance<TEntity> extends TableValuedFunctionBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): TableValuedFunctionBuilder;
     HasName(name: string): TableValuedFunctionBuilder;
     HasName(name: string): DbFunctionBuilderBase;
@@ -3488,13 +3564,11 @@ export interface TableValuedFunctionBuilder_1$instance<TEntity> extends Microsof
 export type TableValuedFunctionBuilder_1<TEntity> = TableValuedFunctionBuilder_1$instance<TEntity> & __TableValuedFunctionBuilder_1$views<TEntity>;
 
 
-export abstract class TriggerBuilder$protected {
-    protected readonly Builder: IConventionTriggerBuilder;
-    protected readonly InternalBuilder: InternalTriggerBuilder;
-}
-
+export interface TriggerBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface TriggerBuilder$instance extends TriggerBuilder$protected {
+    readonly Builder: IConventionTriggerBuilder;
+    readonly InternalBuilder: InternalTriggerBuilder;
     readonly Metadata: IMutableTrigger;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -3517,12 +3591,8 @@ export interface TriggerBuilder$instance extends Microsoft_EntityFrameworkCore_I
 export type TriggerBuilder = TriggerBuilder$instance & __TriggerBuilder$views;
 
 
-export abstract class TypeMappingConfigurationBuilder$protected {
-    protected readonly Configuration: PropertyConfiguration;
-}
-
-
-export interface TypeMappingConfigurationBuilder$instance extends TypeMappingConfigurationBuilder$protected {
+export interface TypeMappingConfigurationBuilder$instance {
+    readonly Configuration: PropertyConfiguration;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     HasAnnotation(annotation: string, value: unknown): TypeMappingConfigurationBuilder;
@@ -3572,14 +3642,12 @@ export const TypeMappingConfigurationBuilder_1: {
 
 export type TypeMappingConfigurationBuilder_1<TProperty> = TypeMappingConfigurationBuilder_1$instance<TProperty>;
 
-export abstract class ViewBuilder$protected {
-    protected readonly StoreObject: StoreObjectIdentifier;
-}
-
+export interface ViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ViewBuilder$instance extends ViewBuilder$protected {
     readonly Name: string;
-    readonly Schema: string;
+    readonly Schema: string | undefined;
+    readonly StoreObject: StoreObjectIdentifier;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
     Property(propertyName: string): ViewColumnBuilder;
@@ -3603,6 +3671,8 @@ export type ViewBuilder = ViewBuilder$instance & __ViewBuilder$views;
 
 
 export interface ViewBuilder_1$instance<TEntity> extends ViewBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     Property(propertyName: string): ViewColumnBuilder;
     Property<TProperty>(propertyName: string): ViewColumnBuilder_1<TProperty>;
 }
@@ -3622,12 +3692,10 @@ export interface ViewBuilder_1$instance<TEntity> extends Microsoft_EntityFramewo
 export type ViewBuilder_1<TEntity> = ViewBuilder_1$instance<TEntity> & __ViewBuilder_1$views<TEntity>;
 
 
-export abstract class ViewColumnBuilder$protected {
-    protected readonly InternalOverrides: RelationalPropertyOverrides;
-}
-
+export interface ViewColumnBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
 
-export interface ViewColumnBuilder$instance extends ViewColumnBuilder$protected {
+    readonly InternalOverrides: RelationalPropertyOverrides;
     readonly Overrides: IMutableRelationalPropertyOverrides;
     Equals(obj: unknown): boolean;
     GetHashCode(): int;
@@ -3652,6 +3720,8 @@ export type ViewColumnBuilder = ViewColumnBuilder$instance & __ViewColumnBuilder
 
 
 export interface ViewColumnBuilder_1$instance<TProperty> extends ViewColumnBuilder$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+
     HasAnnotation(annotation: string, value: unknown): ViewColumnBuilder;
     HasColumnName(name: string): ViewColumnBuilder;
 }