@tsonic/efcore 10.0.11 → 10.0.16

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

@@ -989,36 +989,9 @@ export interface CheckConstraint$instance extends ConventionAnnotatable {
     get Name(): string | undefined;
     set Name(value: string | undefined);
     readonly Sql: string;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetName(storeObject: StoreObjectIdentifier): string | undefined;
     GetNameConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetName(name: string, configurationSource: ConfigurationSource): string | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
@@ -1283,29 +1256,6 @@ export interface Column$instance extends ColumnBase_1$instance<ColumnMapping> {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
     Accessors: ColumnAccessors;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -1342,30 +1292,9 @@ export interface ColumnBase_1$instance<TColumnMappingBase extends IColumnMapping
     readonly StoreType: string;
     readonly StoreTypeMapping: RelationalTypeMapping;
     readonly Table: Table | TableBase;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddPropertyMapping(columnMapping: TColumnMappingBase): boolean;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
     RemovePropertyMapping(columnMapping: TColumnMappingBase): void;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -1414,28 +1343,7 @@ export interface ColumnMapping$instance extends ColumnMappingBase$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IColumnMappingBase: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -1469,28 +1377,7 @@ export interface ColumnMappingBase$instance extends Annotatable {
     readonly Property: IProperty;
     readonly TableMapping: ITableMapping | ITableMappingBase;
     readonly TypeMapping: RelationalTypeMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
 }
 
 
@@ -1569,60 +1456,12 @@ export interface ComplexProperty$instance extends PropertyBase$instance {
     readonly IsCollection: boolean;
     readonly IsInModel: boolean;
     IsNullable: boolean;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetCollectionAccessor(): IClrCollectionAccessor | undefined;
-    GetConfigurationSource(): ConfigurationSource;
-    GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
-    GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldName(): string | undefined;
-    GetGetter(): IClrPropertyGetter;
-    GetIndex(): int;
-    GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
     GetIsNullableConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetMemberInfo(forMaterialization: boolean, forSet: boolean): MemberInfo;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetPropertyAccessMode(): PropertyAccessMode;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    GetSetter(): IClrPropertySetter;
-    GetShadowIndex(): int;
-    IsShadowProperty(): boolean;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnFieldInfoSet(newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo): FieldInfo | undefined;
     OnPropertyNullableChanged(): Nullable_1<System_Internal.Boolean>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetField(fieldName: string): void;
-    SetField(fieldName: string, fromDataAnnotation?: boolean): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, fromDataAnnotation?: boolean): FieldInfo | undefined;
     SetIsNullable(nullable: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>): void;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, fromDataAnnotation?: boolean): Nullable_1<PropertyAccessMode>;
     SetRemovedFromModel(): void;
     ToString(): string;
 }
@@ -1659,19 +1498,7 @@ export interface ComplexPropertyConfiguration$instance extends AnnotatableBase {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IReadOnlyAnnotatable: never;
 
     readonly ClrType: Type;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AnnotationsToDebugString(indent?: int): string;
     Apply(property: IMutableComplexProperty): void;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<Annotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<Annotation>;
 }
 
 
@@ -1725,136 +1552,25 @@ export interface ComplexType$instance extends TypeBase$instance {
     readonly ComplexProperty: ComplexProperty;
     readonly DebugView: DebugView;
     readonly IsInModel: boolean;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddComplexProperty(name: string, propertyType: Type, targetType: Type, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(memberInfo: MemberInfo, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(name: string, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexTypeName: string, targetType: Type, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(memberInfo: MemberInfo, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, propertyType: Type, complexType: Type, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexType: Type, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(memberInfo: MemberInfo, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, complexType: Type, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexType: Type, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddIgnored(name: string, configurationSource: ConfigurationSource): string | undefined;
-    AddIgnored(memberName: string): string | undefined;
-    AddIgnored(memberName: string, fromDataAnnotation?: boolean): string | undefined;
-    AddProperty(name: string, propertyType: Type, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(memberInfo: MemberInfo, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(name: string, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(memberInfo: MemberInfo): IMutableProperty;
-    AddProperty(name: string): IMutableProperty;
-    AddProperty(name: string, propertyType: Type): IMutableProperty;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo): IMutableProperty;
-    AddProperty(memberInfo: MemberInfo, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, propertyType: Type, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
     CalculateCounts(): PropertyCounts;
-    DisplayName(): string;
-    DisplayName(omitSharedType: boolean): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindComplexProperty(name: string): ComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IMutableComplexProperty | undefined;
-    FindComplexProperty(name: string): IMutableComplexProperty | undefined;
-    FindComplexProperty(name: string): IReadOnlyComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IReadOnlyComplexProperty | undefined;
-    FindComplexProperty(name: string): IConventionComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IConventionComplexProperty | undefined;
-    FindComplexProperty(name: string): IComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IComplexProperty | undefined;
-    FindDiscriminatorProperty(): IMutableProperty | undefined;
-    FindDiscriminatorProperty(): IReadOnlyProperty | undefined;
-    FindDiscriminatorProperty(): IConventionProperty | undefined;
-    FindDiscriminatorProperty(): IProperty | undefined;
-    FindIgnoredConfigurationSource(name: string): Nullable_1<ConfigurationSource>;
-    FindIndexerPropertyInfo(): PropertyInfo | undefined;
     FindMember(name: string): PropertyBase | undefined;
-    FindMember(name: string): IMutablePropertyBase | undefined;
-    FindMember(name: string): IReadOnlyPropertyBase | undefined;
-    FindMember(name: string): IConventionPropertyBase | undefined;
-    FindMember(name: string): IPropertyBase | undefined;
     FindMembersInHierarchy(name: string): IEnumerable_1<PropertyBase>;
-    FindProperties(propertyNames: IReadOnlyList_1<System_Internal.String>): IReadOnlyList_1<Property> | undefined;
-    FindProperty(name: string): Property | undefined;
-    FindProperty(name: string): IReadOnlyProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IReadOnlyProperty | undefined;
-    FindProperty(name: string): IConventionProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IConventionProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IProperty | undefined;
-    FindProperty(name: string): IProperty | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetBaseTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetChangeTrackingStrategy(): ChangeTrackingStrategy;
     GetDeclaredMembers(): IEnumerable_1<PropertyBase>;
-    GetDerivedTypes(): IEnumerable_1<TypeBase>;
     GetDirectlyDerivedTypes(): IEnumerable_1<ComplexType>;
-    GetDiscriminatorPropertyConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetDiscriminatorValue(): unknown | undefined;
     GetMembers(): IEnumerable_1<PropertyBase>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetOrCreateEmptyMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
     GetOrCreateMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
-    GetPropertyAccessMode(): PropertyAccessMode;
+    GetRootType(): ComplexType;
     GetRootType(): TypeBase;
-    GetRootType(): IMutableTypeBase;
-    GetRootType(): IReadOnlyTypeBase;
-    GetRootType(): IConventionTypeBase;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsAbstract(): boolean;
+    IsAssignableFrom(derivedType: ComplexType): boolean;
     IsAssignableFrom(derivedType: TypeBase): boolean;
-    IsAssignableFrom(derivedType: IReadOnlyTypeBase): boolean;
-    IsIgnored(name: string): boolean;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnTypeMemberIgnored(name: string): string | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    RemoveComplexProperty(name: string): ComplexProperty | undefined;
-    RemoveComplexProperty(property: ComplexProperty): ComplexProperty | undefined;
-    RemoveComplexProperty(property: IReadOnlyComplexProperty): IMutableComplexProperty | undefined;
-    RemoveComplexProperty(property: IConventionComplexProperty): IConventionComplexProperty | undefined;
-    RemoveDiscriminatorValue(): void;
-    RemoveDiscriminatorValue(): unknown | undefined;
-    RemoveIgnored(name: string): string | undefined;
-    RemoveProperty(name: string): Property | undefined;
-    RemoveProperty(property: Property): Property | undefined;
-    RemoveProperty(property: IReadOnlyProperty): IMutableProperty | undefined;
-    RemoveProperty(property: IReadOnlyProperty): IConventionProperty | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetBaseType(newBaseType: TypeBase, configurationSource: ConfigurationSource): TypeBase | undefined;
-    SetBaseType(structuralType: IConventionTypeBase, fromDataAnnotation?: boolean): IConventionTypeBase | undefined;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): Nullable_1<ChangeTrackingStrategy>;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>): void;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): Nullable_1<ChangeTrackingStrategy>;
+    SetBaseType(newBaseType: ComplexType, configurationSource: ConfigurationSource): ComplexType | undefined;
     SetCounts(value: PropertyCounts): void;
-    SetDiscriminatorProperty(property: Property, configurationSource: ConfigurationSource): Property | undefined;
-    SetDiscriminatorProperty(property: IReadOnlyProperty): void;
-    SetDiscriminatorProperty(property: IReadOnlyProperty, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    SetDiscriminatorValue(value: unknown): void;
-    SetDiscriminatorValue(value: unknown, fromDataAnnotation?: boolean): unknown | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
 }
@@ -1992,42 +1708,15 @@ export interface DbFunction$instance extends ConventionAnnotatable {
     set Translation(value: Func_2<IReadOnlyList_1<SqlExpression>, SqlExpression> | undefined);
     get TypeMapping(): RelationalTypeMapping | undefined;
     set TypeMapping(value: RelationalTypeMapping | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindParameter(name: string): DbFunctionParameter | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetIsBuiltInConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsNullableConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetNameConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetSchemaConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetStoreTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTranslationConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTypeMappingConfigurationSource(): Nullable_1<ConfigurationSource>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsBuiltIn(builtIn: boolean, configurationSource: ConfigurationSource): boolean;
     SetIsNullable(nullable: boolean, configurationSource: ConfigurationSource): boolean;
     SetName(name: string, configurationSource: ConfigurationSource): string | undefined;
@@ -2090,37 +1779,10 @@ export interface DbFunctionParameter$instance extends ConventionAnnotatable {
     StoreType: string;
     get TypeMapping(): RelationalTypeMapping | undefined;
     set TypeMapping(value: RelationalTypeMapping | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPropagatesNullabilityConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetStoreTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTypeMappingConfigurationSource(): Nullable_1<ConfigurationSource>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetPropagatesNullability(propagatesNullability: boolean, configurationSource: ConfigurationSource): boolean;
     SetRemovedFromModel(): void;
     SetStoreType(storeType: string, configurationSource: ConfigurationSource): string | undefined;
@@ -2189,28 +1851,8 @@ export interface ElementType$instance extends ConventionAnnotatable {
     readonly IsReadOnly: boolean;
     get TypeMapping(): CoreTypeMapping | undefined;
     set TypeMapping(value: CoreTypeMapping | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
     CheckValueComparer(comparer: ValueComparer): string | undefined;
     CheckValueConverter(converter: ValueConverter): string | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetIsNullableConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsUnicodeConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -2218,12 +1860,10 @@ export interface ElementType$instance extends ConventionAnnotatable {
     GetJsonValueReaderWriterTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetMaxLength(): Nullable_1<System_Internal.Int32>;
     GetMaxLengthConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPrecision(): Nullable_1<System_Internal.Int32>;
     GetPrecisionConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetProviderClrType(): Type | undefined;
     GetProviderClrTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetScale(): Nullable_1<System_Internal.Int32>;
     GetScaleConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTypeMappingConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -2235,11 +1875,6 @@ export interface ElementType$instance extends ConventionAnnotatable {
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnElementTypeNullableChanged(): Nullable_1<System_Internal.Boolean>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetConfigurationSource(configurationSource: ConfigurationSource): void;
     SetIsNullable(nullable: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetIsUnicode(unicode: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
@@ -2304,32 +1939,9 @@ export interface EntityType$instance extends TypeBase$instance {
     IsKeyless: boolean;
     readonly Owner: EntityType | undefined;
     readonly RelationshipSnapshotFactory: Func_2<IInternalEntry, ISnapshot>;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddComplexProperty(name: string, propertyType: Type, targetType: Type, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(memberInfo: MemberInfo, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(name: string, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexTypeName: string, targetType: Type, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
-    AddComplexProperty(memberInfo: MemberInfo, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, propertyType: Type, complexType: Type, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexType: Type, complexTypeName?: string, collection?: boolean): IMutableComplexProperty;
-    AddComplexProperty(memberInfo: MemberInfo, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, complexType: Type, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
-    AddComplexProperty(name: string, propertyType: Type, memberInfo: MemberInfo, complexType: Type, complexTypeName?: string, collection?: boolean, fromDataAnnotation?: boolean): IConventionComplexProperty | undefined;
     AddData(data: IEnumerable_1<unknown>): void;
     AddForeignKey(property: Property, principalKey: Key, principalEntityType: EntityType, componentConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): ForeignKey | undefined;
     AddForeignKey(properties: IReadOnlyList_1<Property>, principalKey: Key, principalEntityType: EntityType, componentConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): ForeignKey | undefined;
-    AddIgnored(name: string, configurationSource: ConfigurationSource): string | undefined;
-    AddIgnored(memberName: string): string | undefined;
-    AddIgnored(memberName: string, fromDataAnnotation?: boolean): string | undefined;
     AddIndex(property: Property, configurationSource: ConfigurationSource): Index | undefined;
     AddIndex(property: Property, name: string, configurationSource: ConfigurationSource): Index | undefined;
     AddIndex(properties: IReadOnlyList_1<Property>, configurationSource: ConfigurationSource): Index | undefined;
@@ -2339,42 +1951,11 @@ export interface EntityType$instance extends TypeBase$instance {
     AddNavigation(name: string, foreignKey: ForeignKey, pointsToPrincipal: boolean): Navigation;
     AddNavigation(navigationMember: MemberInfo, foreignKey: ForeignKey, pointsToPrincipal: boolean): Navigation;
     AddNavigation(navigationMember: MemberIdentity, foreignKey: ForeignKey, pointsToPrincipal: boolean): Navigation;
-    AddProperty(name: string, propertyType: Type, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(memberInfo: MemberInfo, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(name: string, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): Property | undefined;
-    AddProperty(memberInfo: MemberInfo): IMutableProperty;
-    AddProperty(name: string): IMutableProperty;
-    AddProperty(name: string, propertyType: Type): IMutableProperty;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo): IMutableProperty;
-    AddProperty(memberInfo: MemberInfo, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, propertyType: Type, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
     AddServiceProperty(memberInfo: MemberInfo, serviceType: Type, configurationSource: ConfigurationSource): ServiceProperty;
     AddSkipNavigation(name: string, navigationType: Type, memberInfo: MemberInfo, targetEntityType: EntityType, collection: boolean, onDependent: boolean, configurationSource: ConfigurationSource): SkipNavigation | undefined;
     AddTrigger(modelName: string, configurationSource: ConfigurationSource): Trigger | undefined;
-    AnnotationsToDebugString(indent?: int): string;
     CalculateCounts(): PropertyCounts;
     CheckQueryFilter(queryFilter: IQueryFilter): string | undefined;
-    DisplayName(): string;
-    DisplayName(omitSharedType: boolean): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindComplexProperty(name: string): ComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IMutableComplexProperty | undefined;
-    FindComplexProperty(name: string): IMutableComplexProperty | undefined;
-    FindComplexProperty(name: string): IReadOnlyComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IReadOnlyComplexProperty | undefined;
-    FindComplexProperty(name: string): IConventionComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IConventionComplexProperty | undefined;
-    FindComplexProperty(name: string): IComplexProperty | undefined;
-    FindComplexProperty(memberInfo: MemberInfo): IComplexProperty | undefined;
     FindDeclaredForeignKey(properties: IReadOnlyList_1<IReadOnlyProperty>, principalKey: IReadOnlyKey, principalEntityType: IReadOnlyEntityType): ForeignKey | undefined;
     FindDeclaredForeignKeys(properties: IReadOnlyList_1<IReadOnlyProperty>): IEnumerable_1<ForeignKey>;
     FindDeclaredIndex(properties: IReadOnlyList_1<IReadOnlyProperty>): Index | undefined;
@@ -2395,30 +1976,20 @@ export interface EntityType$instance extends TypeBase$instance {
     FindDerivedServicePropertiesInclusive(propertyName: string): IEnumerable_1<ServiceProperty>;
     FindDerivedSkipNavigations(name: string): IEnumerable_1<SkipNavigation>;
     FindDerivedSkipNavigationsInclusive(name: string): IEnumerable_1<SkipNavigation>;
-    FindDiscriminatorProperty(): IMutableProperty | undefined;
-    FindDiscriminatorProperty(): IReadOnlyProperty | undefined;
-    FindDiscriminatorProperty(): IConventionProperty | undefined;
-    FindDiscriminatorProperty(): IProperty | undefined;
     FindForeignKey(property: IReadOnlyProperty, principalKey: IReadOnlyKey, principalEntityType: IReadOnlyEntityType): ForeignKey | undefined;
     FindForeignKey(properties: IReadOnlyList_1<IReadOnlyProperty>, principalKey: IReadOnlyKey, principalEntityType: IReadOnlyEntityType): ForeignKey | undefined;
     FindForeignKeys(property: IReadOnlyProperty): IEnumerable_1<ForeignKey>;
     FindForeignKeys(properties: IReadOnlyList_1<IReadOnlyProperty>): IEnumerable_1<ForeignKey>;
     FindForeignKeysInHierarchy(properties: IReadOnlyList_1<IReadOnlyProperty>): IEnumerable_1<ForeignKey>;
     FindForeignKeysInHierarchy(properties: IReadOnlyList_1<IReadOnlyProperty>, principalKey: IReadOnlyKey, principalEntityType: IReadOnlyEntityType): IEnumerable_1<ForeignKey>;
-    FindIgnoredConfigurationSource(name: string): Nullable_1<ConfigurationSource>;
     FindIndex(property: IReadOnlyProperty): Index | undefined;
     FindIndex(properties: IReadOnlyList_1<IReadOnlyProperty>): Index | undefined;
     FindIndex(name: string): Index | undefined;
-    FindIndexerPropertyInfo(): PropertyInfo | undefined;
     FindIndexesInHierarchy(properties: IReadOnlyList_1<IReadOnlyProperty>): IEnumerable_1<Index>;
     FindIndexesInHierarchy(name: string): IEnumerable_1<Index>;
     FindKey(property: IReadOnlyProperty): Key | undefined;
     FindKey(properties: IReadOnlyList_1<IReadOnlyProperty>): Key | undefined;
     FindMember(name: string): PropertyBase | undefined;
-    FindMember(name: string): IMutablePropertyBase | undefined;
-    FindMember(name: string): IReadOnlyPropertyBase | undefined;
-    FindMember(name: string): IConventionPropertyBase | undefined;
-    FindMember(name: string): IPropertyBase | undefined;
     FindMembersInHierarchy(name: string): IEnumerable_1<PropertyBase>;
     FindNavigation(name: string): Navigation | undefined;
     FindNavigation(memberInfo: MemberInfo): Navigation | undefined;
@@ -2426,27 +1997,13 @@ export interface EntityType$instance extends TypeBase$instance {
     FindOwnership(): ForeignKey | undefined;
     FindPrimaryKey(): Key | undefined;
     FindPrimaryKey(properties: IReadOnlyList_1<Property>): Key | undefined;
-    FindProperties(propertyNames: IReadOnlyList_1<System_Internal.String>): IReadOnlyList_1<Property> | undefined;
-    FindProperty(name: string): Property | undefined;
-    FindProperty(name: string): IReadOnlyProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IReadOnlyProperty | undefined;
-    FindProperty(name: string): IConventionProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IConventionProperty | undefined;
-    FindProperty(memberInfo: MemberInfo): IProperty | undefined;
-    FindProperty(name: string): IProperty | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
     FindServicePropertiesInHierarchy(propertyName: string): IEnumerable_1<ServiceProperty>;
     FindServiceProperty(name: string): ServiceProperty | undefined;
     FindServiceProperty(memberInfo: MemberInfo): Property | undefined;
     FindSkipNavigation(name: string): SkipNavigation | undefined;
     FindSkipNavigation(memberInfo: MemberInfo): SkipNavigation | undefined;
     FindSkipNavigationsInHierarchy(name: string): IEnumerable_1<SkipNavigation>;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetBaseTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetChangeTrackingStrategy(): ChangeTrackingStrategy;
-    GetConfigurationSource(): ConfigurationSource;
     GetDeclaredForeignKeys(): IEnumerable_1<ForeignKey>;
     GetDeclaredIndexes(): IEnumerable_1<Index>;
     GetDeclaredKeys(): IEnumerable_1<Key>;
@@ -2464,10 +2021,7 @@ export interface EntityType$instance extends TypeBase$instance {
     GetDerivedReferencingSkipNavigations(): IEnumerable_1<SkipNavigation>;
     GetDerivedServiceProperties(): IEnumerable_1<ServiceProperty>;
     GetDerivedSkipNavigations(): IEnumerable_1<SkipNavigation>;
-    GetDerivedTypes(): IEnumerable_1<TypeBase>;
     GetDirectlyDerivedTypes(): IEnumerable_1<EntityType>;
-    GetDiscriminatorPropertyConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetDiscriminatorValue(): unknown | undefined;
     GetForeignKeys(): IEnumerable_1<ForeignKey>;
     GetForeignKeysInHierarchy(): IEnumerable_1<ForeignKey>;
     GetIndexes(): IEnumerable_1<Index>;
@@ -2476,77 +2030,43 @@ export interface EntityType$instance extends TypeBase$instance {
     GetMembers(): IEnumerable_1<PropertyBase>;
     GetNavigationAccessMode(): PropertyAccessMode;
     GetNavigations(): IEnumerable_1<Navigation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetOrCreateEmptyMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
     GetOrCreateMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
     GetPrimaryKeyConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetPropertyAccessMode(): PropertyAccessMode;
     GetQueryFilter(): LambdaExpression | undefined;
     GetQueryFilterConfigurationSource(filterKey: string): Nullable_1<ConfigurationSource>;
     GetQueryFilterConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetRawSeedData(): IEnumerable_1<unknown>;
     GetReferencingForeignKeys(): IEnumerable_1<ForeignKey>;
     GetReferencingSkipNavigations(): IEnumerable_1<SkipNavigation>;
+    GetRootType(): EntityType;
     GetRootType(): TypeBase;
-    GetRootType(): IMutableTypeBase;
-    GetRootType(): IReadOnlyTypeBase;
-    GetRootType(): IConventionTypeBase;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetSeedData(providerValues?: boolean): IEnumerable_1<IDictionary_2<System_Internal.String, unknown | undefined>>;
     GetServiceProperties(): IEnumerable_1<ServiceProperty>;
     GetSkipNavigations(): IEnumerable_1<SkipNavigation>;
     GetSnapshottableMembers(): IEnumerable_1<PropertyBase>;
-    GetSnapshottableMembers(): IEnumerable_1<PropertyBase>;
     HasServiceProperties(): boolean;
-    IsAbstract(): boolean;
-    IsAssignableFrom(derivedType: TypeBase): boolean;
-    IsAssignableFrom(derivedType: IReadOnlyTypeBase): boolean;
-    IsIgnored(name: string): boolean;
     IsOwned(): boolean;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnForeignKeyUpdated(foreignKey: ForeignKey): void;
     OnForeignKeyUpdating(foreignKey: ForeignKey): void;
     OnTypeMemberIgnored(name: string): string | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    RemoveComplexProperty(name: string): ComplexProperty | undefined;
-    RemoveComplexProperty(property: ComplexProperty): ComplexProperty | undefined;
-    RemoveComplexProperty(property: IReadOnlyComplexProperty): IMutableComplexProperty | undefined;
-    RemoveComplexProperty(property: IConventionComplexProperty): IConventionComplexProperty | undefined;
-    RemoveDiscriminatorValue(): void;
-    RemoveDiscriminatorValue(): unknown | undefined;
     RemoveForeignKey(properties: IReadOnlyList_1<IReadOnlyProperty>, principalKey: IReadOnlyKey, principalEntityType: IReadOnlyEntityType): ForeignKey | undefined;
     RemoveForeignKey(foreignKey: ForeignKey): ForeignKey | undefined;
-    RemoveIgnored(name: string): string | undefined;
     RemoveIndex(properties: IReadOnlyList_1<IReadOnlyProperty>): Index | undefined;
     RemoveIndex(name: string): Index | undefined;
     RemoveIndex(index: Index): Index | undefined;
     RemoveKey(properties: IReadOnlyList_1<IReadOnlyProperty>): Key | undefined;
     RemoveKey(key: Key): Key | undefined;
     RemoveNavigation(name: string): Navigation | undefined;
-    RemoveProperty(name: string): Property | undefined;
-    RemoveProperty(property: Property): Property | undefined;
-    RemoveProperty(property: IReadOnlyProperty): IMutableProperty | undefined;
-    RemoveProperty(property: IReadOnlyProperty): IConventionProperty | undefined;
     RemoveServiceProperty(name: string): ServiceProperty | undefined;
     RemoveServiceProperty(property: ServiceProperty): ServiceProperty | undefined;
     RemoveSkipNavigation(name: string): SkipNavigation | undefined;
     RemoveSkipNavigation(navigation: SkipNavigation): SkipNavigation | undefined;
     RemoveTrigger(modelName: string): Trigger | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetBaseType(newBaseType: TypeBase, configurationSource: ConfigurationSource): TypeBase | undefined;
-    SetBaseType(structuralType: IConventionTypeBase, fromDataAnnotation?: boolean): IConventionTypeBase | undefined;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): Nullable_1<ChangeTrackingStrategy>;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>): void;
-    SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): Nullable_1<ChangeTrackingStrategy>;
-    SetDiscriminatorProperty(property: Property, configurationSource: ConfigurationSource): Property | undefined;
-    SetDiscriminatorProperty(property: IReadOnlyProperty): void;
-    SetDiscriminatorProperty(property: IReadOnlyProperty, fromDataAnnotation?: boolean): IConventionProperty | undefined;
-    SetDiscriminatorValue(value: unknown): void;
-    SetDiscriminatorValue(value: unknown, fromDataAnnotation?: boolean): unknown | undefined;
+    SetBaseType(newBaseType: EntityType, configurationSource: ConfigurationSource): EntityType | undefined;
     SetIsKeyless(keyless: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetIsOwned(value: boolean): void;
     SetPrimaryKey(property: Property, configurationSource: ConfigurationSource): Key | undefined;
@@ -2616,35 +2136,8 @@ export interface EntityTypeMappingFragment$instance extends ConventionAnnotatabl
     readonly IsReadOnly: boolean;
     IsTableExcludedFromMigrations: Nullable_1<System_Internal.Boolean>;
     readonly StoreObject: StoreObjectIdentifier;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetIsTableExcludedFromMigrationsConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsTableExcludedFromMigrations(excluded: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetRemovedFromModel(): void;
     ToString(): string;
@@ -2734,28 +2227,8 @@ export interface ForeignKey$instance extends ConventionAnnotatable {
     Properties: IReadOnlyList_1<Property>;
     get ReferencingSkipNavigations(): ISet_1<SkipNavigation> | undefined;
     set ReferencingSkipNavigations(value: ISet_1<SkipNavigation> | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindNavigationsFromInHierarchy(entityType: EntityType): IEnumerable_1<Navigation>;
     FindNavigationsTo(entityType: EntityType): IEnumerable_1<Navigation>;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetDeleteBehaviorConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetDependentToPrincipalConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -2763,21 +2236,14 @@ export interface ForeignKey$instance extends ConventionAnnotatable {
     GetIsRequiredConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsRequiredDependentConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsUniqueConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPrincipalEndConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetPrincipalKeyConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetPrincipalToDependentConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetPropertiesConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetReferencingSkipNavigations(): IEnumerable_1<SkipNavigation>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
     ResolveOtherEntityType(entityType: EntityType): EntityType;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetDeleteBehavior(deleteBehavior: Nullable_1<DeleteBehavior>, configurationSource: ConfigurationSource): Nullable_1<DeleteBehavior>;
     SetDependentToPrincipal(name: string, configurationSource: ConfigurationSource): Navigation | undefined;
     SetDependentToPrincipal(property: MemberInfo, configurationSource: ConfigurationSource): Navigation | undefined;
@@ -2847,28 +2313,7 @@ export interface ForeignKeyConstraint$instance extends Annotatable {
     readonly PrincipalTable: Table;
     readonly PrincipalUniqueConstraint: UniqueConstraint;
     readonly Table: Table;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetRowForeignKeyValueFactory(): IRowForeignKeyValueFactory;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetRowForeignKeyValueFactory(factory: IRowForeignKeyValueFactory): void;
     ToString(): string;
 }
@@ -2918,29 +2363,6 @@ export interface FunctionColumn$instance extends ColumnBase_1$instance<FunctionC
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
     readonly Function: StoreFunction;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -2971,28 +2393,7 @@ export interface FunctionColumnMapping$instance extends ColumnMappingBase$instan
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
     readonly FunctionMapping: IFunctionMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -3025,28 +2426,6 @@ export interface FunctionMapping$instance extends TableMappingBase_1$instance<Fu
     readonly DbFunction: IDbFunction;
     IsDefaultFunctionMapping: boolean;
     readonly StoreFunction: IStoreFunction;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -3088,40 +2467,13 @@ export interface Index$instance extends ConventionAnnotatable {
     IsUnique: boolean;
     readonly Name: string | undefined;
     readonly Properties: IReadOnlyList_1<Property>;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
     DisplayName(): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetIsDescendingConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsUniqueConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetNullableValueFactory<TKey>(): IDependentKeyValueFactory_1<TKey>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsDescending(descending: IReadOnlyList_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): IReadOnlyList_1<System_Internal.Boolean> | undefined;
     SetIsUnique(unique: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetRemovedFromModel(): void;
@@ -3156,16 +2508,8 @@ export interface InternalCheckConstraintBuilder$instance extends AnnotatableBuil
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionCheckConstraintBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetName(name: string, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<CheckConstraint, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasName(name: string, configurationSource: ConfigurationSource): IConventionCheckConstraintBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<CheckConstraint, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -3192,22 +2536,8 @@ export interface InternalComplexPropertyBuilder$instance extends InternalPropert
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionPropertyBaseBuilder_1: never;
 
     readonly ComplexTypeBuilder: InternalComplexTypeBuilder;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
-    HasField(fieldName: string, configurationSource: ConfigurationSource): IConventionComplexPropertyBuilder;
-    HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): IConventionComplexPropertyBuilder;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     IsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalComplexPropertyBuilder | undefined;
-    UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): IConventionComplexPropertyBuilder;
 }
 
 
@@ -3235,73 +2565,21 @@ export interface InternalComplexTypeBuilder$instance extends InternalTypeBaseBui
 
     CanAddComplexProperty(propertyName: string, propertyType: Type, targetType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource, checkClrProperty?: boolean): boolean;
     CanAddProperty(propertyType: Type, propertyName: string, configurationSource: ConfigurationSource, checkClrProperty: boolean, skipTypeCheck: boolean): boolean;
-    CanHaveComplexProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, complexType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanHaveComplexProperty(propertyType: Type, propertyName: string, complexType?: Type, fromDataAnnotation?: boolean): boolean;
-    CanHaveComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): boolean;
-    CanHaveProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, checkClrProperty?: boolean): boolean;
-    CanHaveProperty(propertyType: Type, propertyName: string, fromDataAnnotation?: boolean): boolean;
-    CanHaveProperty(memberInfo: MemberInfo, fromDataAnnotation?: boolean): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource, shouldThrow: boolean): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): boolean;
-    CanRemoveComplexProperty(complexProperty: IConventionComplexProperty, fromDataAnnotation?: boolean): boolean;
-    CanRemoveDiscriminator(configurationSource: ConfigurationSource): boolean;
-    CanRemoveDiscriminator(fromDataAnnotation?: boolean): boolean;
-    CanRemoveProperty(property: Property, configurationSource: ConfigurationSource, canOverrideSameSource?: boolean): boolean;
-    CanRemoveProperty(property: IConventionProperty, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
     CanSetBaseType(baseComplexType: ComplexType, configurationSource: ConfigurationSource): boolean;
-    CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): boolean;
-    CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): boolean;
     CanSetConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): boolean;
-    CanSetDiscriminator(name: string, type: Type, configurationSource: ConfigurationSource): boolean;
-    CanSetDiscriminator(type: Type, fromDataAnnotation?: boolean): boolean;
-    CanSetDiscriminator(name: string, type: Type, fromDataAnnotation?: boolean): boolean;
     CanSetServiceOnlyConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): boolean;
-    ComplexProperty(memberInfo: MemberInfo, complexTypeName: string, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, complexTypeName: string, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, complexTypeName: string, complexType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, complexType?: Type, fromDataAnnotation?: boolean): IConventionComplexPropertyBuilder | undefined;
-    ComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): IConventionComplexPropertyBuilder | undefined;
-    GetOrCreateProperties(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: Nullable_1<ConfigurationSource>, referencedProperties?: IReadOnlyList_1<Property>, required?: boolean, useDefaultType?: boolean): IReadOnlyList_1<Property> | undefined;
-    GetOrCreateProperties(clrMembers: IEnumerable_1<MemberInfo>, configurationSource: Nullable_1<ConfigurationSource>): IReadOnlyList_1<Property> | undefined;
-    GetOrCreateProperties(propertyNames: IReadOnlyList_1<System_Internal.String>, fromDataAnnotation?: boolean): IReadOnlyList_1<IConventionProperty> | undefined;
-    GetOrCreateProperties(memberInfos: IEnumerable_1<MemberInfo>, fromDataAnnotation?: boolean): IReadOnlyList_1<IConventionProperty> | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown> | undefined;
     HasBaseType(baseComplexType: ComplexType, configurationSource: ConfigurationSource): InternalComplexTypeBuilder | undefined;
-    HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
     HasConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): InternalComplexTypeBuilder | undefined;
     HasDiscriminator(configurationSource: ConfigurationSource): ComplexTypeDiscriminatorBuilder | undefined;
     HasDiscriminator(name: string, type: Type, configurationSource: ConfigurationSource): ComplexTypeDiscriminatorBuilder | undefined;
     HasDiscriminator(memberInfo: MemberInfo, configurationSource: ConfigurationSource): ComplexTypeDiscriminatorBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown> | undefined;
-    HasNoComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasNoComplexProperty(complexProperty: IConventionComplexProperty, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
+    HasNoDiscriminator(configurationSource: ConfigurationSource): InternalComplexTypeBuilder | undefined;
     HasNoDiscriminator(fromDataAnnotation?: boolean): IConventionComplexTypeBuilder | undefined;
     HasNoDiscriminator(configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasNoProperty(property: IConventionProperty, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
     HasServiceOnlyConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): InternalComplexTypeBuilder | undefined;
-    IndexerProperty(propertyType: Type, propertyName: string, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    IndexerProperty(propertyType: Type, propertyName: string, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
-    IsIgnored(name: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    IsIgnored(memberName: string, fromDataAnnotation?: boolean): boolean;
-    Property(propertyType: Type, propertyName: string, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyName: string, configurationSource: Nullable_1<ConfigurationSource>): InternalPropertyBuilder | undefined;
-    Property(memberInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
-    Property(memberInfo: MemberInfo, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
-    RemoveUnusedImplicitProperties(properties: IReadOnlyList_1<IConventionProperty>): InternalTypeBaseBuilder;
-    RemoveUnusedImplicitProperties(properties: IReadOnlyList_1<IConventionProperty>): IConventionTypeBaseBuilder;
+    Ignore(name: string, configurationSource: ConfigurationSource): InternalComplexTypeBuilder | undefined;
 }
 
 
@@ -3325,10 +2603,6 @@ export interface InternalDbFunctionBuilder$instance extends AnnotatableBuilder_2
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDbFunctionBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetIsBuiltIn(builtIn: boolean, configurationSource: ConfigurationSource): boolean;
     CanSetIsNullable(nullable: boolean, configurationSource: ConfigurationSource): boolean;
     CanSetName(name: string, configurationSource: ConfigurationSource): boolean;
@@ -3336,11 +2610,7 @@ export interface InternalDbFunctionBuilder$instance extends AnnotatableBuilder_2
     CanSetStoreType(storeType: string, configurationSource: ConfigurationSource): boolean;
     CanSetTranslation(translation: Func_2<IReadOnlyList_1<SqlExpression>, SqlExpression>, configurationSource: ConfigurationSource): boolean;
     CanSetTypeMapping(returnTypeMapping: RelationalTypeMapping, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<DbFunction, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasName(name: string, configurationSource: ConfigurationSource): IConventionDbFunctionBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<DbFunction, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasParameter(name: string, configurationSource: ConfigurationSource): InternalDbFunctionParameterBuilder;
     HasSchema(schema: string, configurationSource: ConfigurationSource): IConventionDbFunctionBuilder | undefined;
     HasStoreType(storeType: string, configurationSource: ConfigurationSource): IConventionDbFunctionBuilder | undefined;
@@ -3370,17 +2640,9 @@ export interface InternalDbFunctionParameterBuilder$instance extends Annotatable
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionDbFunctionParameterBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetPropagatesNullability(propagatesNullability: boolean, configurationSource: ConfigurationSource): boolean;
     CanSetStoreType(storeType: string, configurationSource: ConfigurationSource): boolean;
     CanSetTypeMapping(typeMapping: RelationalTypeMapping, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<DbFunctionParameter, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<DbFunctionParameter, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasStoreType(storeType: string, configurationSource: ConfigurationSource): IConventionDbFunctionParameterBuilder | undefined;
     HasTypeMapping(typeMapping: RelationalTypeMapping, configurationSource: ConfigurationSource): IConventionDbFunctionParameterBuilder | undefined;
     PropagatesNullability(propagatesNullability: boolean, configurationSource: ConfigurationSource): IConventionDbFunctionParameterBuilder | undefined;
@@ -3407,10 +2669,6 @@ export interface InternalElementTypeBuilder$instance extends AnnotatableBuilder_
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionElementTypeBuilder: never;
 
     readonly This: IConventionElementTypeBuilder;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetConversion(converter: ValueConverter, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetConversion(providerClrType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetConverter(converterType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
@@ -3422,14 +2680,10 @@ export interface InternalElementTypeBuilder$instance extends AnnotatableBuilder_
     CanSetTypeMapping(typeMapping: CoreTypeMapping, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetValueComparer(comparer: ValueComparer, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetValueComparer(comparerType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<ElementType, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasConversion(converter: ValueConverter, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
     HasConversion(providerClrType: Type, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
     HasConverter(converterType: Type, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
     HasMaxLength(maxLength: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<ElementType, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasPrecision(precision: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
     HasScale(scale: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
     HasTypeMapping(typeMapping: CoreTypeMapping, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
@@ -3463,69 +2717,34 @@ export interface InternalEntityTypeBuilder$instance extends InternalTypeBaseBuil
     CanAddComplexProperty(propertyName: string, propertyType: Type, targetType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource, checkClrProperty?: boolean): boolean;
     CanAddNavigation(navigationName: string, type: Type, configurationSource: ConfigurationSource): boolean;
     CanAddProperty(propertyType: Type, propertyName: string, configurationSource: ConfigurationSource, checkClrProperty: boolean, skipTypeCheck: boolean): boolean;
-    CanHaveComplexProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, complexType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanHaveComplexProperty(propertyType: Type, propertyName: string, complexType?: Type, fromDataAnnotation?: boolean): boolean;
-    CanHaveComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): boolean;
     CanHaveIndex(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): boolean;
     CanHaveNavigation(navigationName: string, type: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanHaveProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, checkClrProperty?: boolean): boolean;
-    CanHaveProperty(propertyType: Type, propertyName: string, fromDataAnnotation?: boolean): boolean;
-    CanHaveProperty(memberInfo: MemberInfo, fromDataAnnotation?: boolean): boolean;
     CanHaveServiceProperty(memberInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanHaveSkipNavigation(skipNavigationName: string, type: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource, shouldThrow: boolean): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): boolean;
-    CanRemoveComplexProperty(complexProperty: IConventionComplexProperty, fromDataAnnotation?: boolean): boolean;
-    CanRemoveDiscriminator(configurationSource: ConfigurationSource): boolean;
-    CanRemoveDiscriminator(fromDataAnnotation?: boolean): boolean;
     CanRemoveForeignKey(foreignKey: ForeignKey, configurationSource: ConfigurationSource): boolean;
     CanRemoveIndex(index: Index, configurationSource: ConfigurationSource): boolean;
     CanRemoveKey(key: Key, configurationSource: ConfigurationSource): boolean;
     CanRemoveKey(configurationSource: ConfigurationSource): boolean;
     CanRemoveNavigation(navigation: Navigation, configurationSource: ConfigurationSource): boolean;
-    CanRemoveProperty(property: Property, configurationSource: ConfigurationSource, canOverrideSameSource?: boolean): boolean;
-    CanRemoveProperty(property: IConventionProperty, fromDataAnnotation?: boolean): boolean;
     CanRemoveServiceProperty(serviceProperty: ServiceProperty, configurationSource: ConfigurationSource): boolean;
     CanRemoveSkipNavigation(skipNavigation: SkipNavigation, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanRemoveSkipNavigation(skipNavigation: SkipNavigation, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
     CanSetBaseType(baseEntityType: EntityType, configurationSource: ConfigurationSource): boolean;
-    CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): boolean;
-    CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): boolean;
     CanSetConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): boolean;
-    CanSetDiscriminator(name: string, type: Type, configurationSource: ConfigurationSource): boolean;
-    CanSetDiscriminator(type: Type, fromDataAnnotation?: boolean): boolean;
-    CanSetDiscriminator(name: string, type: Type, fromDataAnnotation?: boolean): boolean;
     CanSetIsOwned(owned: boolean, configurationSource: ConfigurationSource): boolean;
     CanSetPrimaryKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): boolean;
     CanSetPrimaryKey(properties: IReadOnlyList_1<IConventionProperty>, configurationSource: ConfigurationSource): boolean;
     CanSetQueryFilter(filter: LambdaExpression, configurationSource: ConfigurationSource): boolean;
     CanSetQueryFilter(queryFilter: QueryFilter): boolean;
     CanSetServiceOnlyConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): boolean;
-    ComplexProperty(memberInfo: MemberInfo, complexTypeName: string, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, complexTypeName: string, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, complexTypeName: string, complexType: Type, collection: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): InternalComplexPropertyBuilder | undefined;
-    ComplexProperty(propertyType: Type, propertyName: string, complexType?: Type, fromDataAnnotation?: boolean): IConventionComplexPropertyBuilder | undefined;
-    ComplexProperty(memberInfo: MemberInfo, complexType?: Type, fromDataAnnotation?: boolean): IConventionComplexPropertyBuilder | undefined;
     CreateForeignKey(principalEntityTypeBuilder: InternalEntityTypeBuilder, dependentProperties: IReadOnlyList_1<Property>, principalKey: Key, propertyBaseName: string, required: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
-    GetOrCreateProperties(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: Nullable_1<ConfigurationSource>, referencedProperties?: IReadOnlyList_1<Property>, required?: boolean, useDefaultType?: boolean): IReadOnlyList_1<Property> | undefined;
-    GetOrCreateProperties(clrMembers: IEnumerable_1<MemberInfo>, configurationSource: Nullable_1<ConfigurationSource>): IReadOnlyList_1<Property> | undefined;
-    GetOrCreateProperties(propertyNames: IReadOnlyList_1<System_Internal.String>, fromDataAnnotation?: boolean): IReadOnlyList_1<IConventionProperty> | undefined;
-    GetOrCreateProperties(memberInfos: IEnumerable_1<MemberInfo>, fromDataAnnotation?: boolean): IReadOnlyList_1<IConventionProperty> | undefined;
     GetTargetEntityTypeBuilder(targetClrType: Type, navigationInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>, targetShouldBeOwned?: Nullable_1<System_Internal.Boolean>): InternalEntityTypeBuilder | undefined;
     GetTargetEntityTypeBuilder(targetEntityType: TypeIdentity, navigation: MemberIdentity, configurationSource: Nullable_1<ConfigurationSource>, targetShouldBeOwned?: Nullable_1<System_Internal.Boolean>): InternalEntityTypeBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown> | undefined;
     HasBaseType(baseEntityType: Type, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasBaseType(baseEntityTypeName: string, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasBaseType(baseEntityType: EntityType, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
-    HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
     HasConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): IConventionEntityTypeBuilder | undefined;
     HasData(data: IEnumerable_1<unknown>, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasDiscriminator(configurationSource: ConfigurationSource): DiscriminatorBuilder | undefined;
@@ -3540,17 +2759,12 @@ export interface InternalEntityTypeBuilder$instance extends InternalTypeBaseBuil
     HasKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): InternalKeyBuilder | undefined;
     HasKey(clrMembers: IReadOnlyList_1<MemberInfo>, configurationSource: ConfigurationSource): InternalKeyBuilder | undefined;
     HasKey(properties: IReadOnlyList_1<Property>, configurationSource: Nullable_1<ConfigurationSource>): InternalKeyBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown> | undefined;
-    HasNoComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasNoComplexProperty(complexProperty: IConventionComplexProperty, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
+    HasNoDiscriminator(configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoDiscriminator(configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
     HasNoIndex(index: Index, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoKey(key: Key, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoKey(configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoNavigation(navigation: Navigation, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
-    HasNoProperty(property: IConventionProperty, fromDataAnnotation?: boolean): IConventionTypeBaseBuilder | undefined;
     HasNoRelationship(foreignKey: ForeignKey, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoServiceProperty(serviceProperty: ServiceProperty, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     HasNoSkipNavigation(skipNavigation: SkipNavigation, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
@@ -3581,26 +2795,14 @@ export interface InternalEntityTypeBuilder$instance extends InternalTypeBaseBuil
     HasSkipNavigation(navigation: MemberIdentity, targetEntityType: EntityType, configurationSource: Nullable_1<ConfigurationSource>, collection?: Nullable_1<System_Internal.Boolean>, onDependent?: Nullable_1<System_Internal.Boolean>): InternalSkipNavigationBuilder | undefined;
     HasSkipNavigation(navigation: MemberIdentity, targetEntityType: EntityType, navigationType: Type, configurationSource: Nullable_1<ConfigurationSource>, collection?: Nullable_1<System_Internal.Boolean>, onDependent?: Nullable_1<System_Internal.Boolean>): InternalSkipNavigationBuilder | undefined;
     HasTrigger(modelName: string, configurationSource: ConfigurationSource): InternalTriggerBuilder | undefined;
-    IndexerProperty(propertyType: Type, propertyName: string, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    IndexerProperty(propertyType: Type, propertyName: string, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
-    IsIgnored(name: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    IsIgnored(memberName: string, fromDataAnnotation?: boolean): boolean;
+    Ignore(name: string, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     IsOwned(owned: boolean, configurationSource: ConfigurationSource, futureOwnership?: ForeignKey): InternalEntityTypeBuilder | undefined;
     Navigation(memberInfo: MemberInfo): IMutableNavigationBase;
     Navigation(navigationName: string): IMutableNavigationBase;
     PrimaryKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): InternalKeyBuilder | undefined;
     PrimaryKey(clrMembers: IReadOnlyList_1<MemberInfo>, configurationSource: ConfigurationSource): InternalKeyBuilder | undefined;
     PrimaryKey(properties: IReadOnlyList_1<Property>, configurationSource: ConfigurationSource): InternalKeyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyName: string, configurationSource: Nullable_1<ConfigurationSource>): InternalPropertyBuilder | undefined;
-    Property(memberInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, skipTypeCheck?: boolean): InternalPropertyBuilder | undefined;
-    Property(propertyType: Type, propertyName: string, setTypeConfigurationSource?: boolean, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
-    Property(memberInfo: MemberInfo, fromDataAnnotation?: boolean): IConventionPropertyBuilder | undefined;
     RemoveMembersInHierarchy(propertyName: string, configurationSource: ConfigurationSource): void;
-    RemoveUnusedImplicitProperties(properties: IReadOnlyList_1<IConventionProperty>): InternalTypeBaseBuilder;
-    RemoveUnusedImplicitProperties(properties: IReadOnlyList_1<IConventionProperty>): IConventionTypeBaseBuilder;
     ServiceProperty(memberInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>): InternalServicePropertyBuilder | undefined;
     ServiceProperty(serviceType: Type, memberInfo: MemberInfo, configurationSource: Nullable_1<ConfigurationSource>): InternalServicePropertyBuilder | undefined;
     ShouldReuniquifyTemporaryProperties(foreignKey: ForeignKey): boolean;
@@ -3636,15 +2838,7 @@ export interface InternalEntityTypeMappingFragmentBuilder$instance extends Annot
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionEntityTypeMappingFragmentBuilder: never;
 
     CanExcludeTableFromMigrations(excludedFromMigrations: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     ExcludeTableFromMigrations(excludedFromMigrations: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalEntityTypeMappingFragmentBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<EntityTypeMappingFragment, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<EntityTypeMappingFragment, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -3669,10 +2863,6 @@ export interface InternalForeignKeyBuilder$instance extends AnnotatableBuilder_2
 
     Attach(entityTypeBuilder: InternalEntityTypeBuilder): InternalForeignKeyBuilder | undefined;
     CanInvert(newForeignKeyProperties: IReadOnlyList_1<Property>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetDeleteBehavior(deleteBehavior: Nullable_1<DeleteBehavior>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetEntityTypes(principalEntityType: EntityType, dependentEntityType: EntityType, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetEntityTypes(principalEntityType: EntityType, dependentEntityType: EntityType, configurationSource: Nullable_1<ConfigurationSource>, shouldResetToPrincipal: boolean, shouldResetToDependent: boolean): boolean;
@@ -3689,8 +2879,6 @@ export interface InternalForeignKeyBuilder$instance extends AnnotatableBuilder_2
     CanSetPrincipalKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetPrincipalKey(properties: IReadOnlyList_1<Property>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     DependentEntityType(dependentEntityType: EntityType, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<ForeignKey, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasEntityTypes(principalEntityType: EntityType, dependentEntityType: EntityType, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasForeignKey(properties: IReadOnlyList_1<MemberInfo>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasForeignKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
@@ -3705,8 +2893,6 @@ export interface InternalForeignKeyBuilder$instance extends AnnotatableBuilder_2
     HasNavigations(navigationToPrincipal: Nullable_1<MemberIdentity>, navigationToDependent: Nullable_1<MemberIdentity>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasNavigations(navigationToPrincipalName: string, navigationToDependentName: string, principalEntityType: EntityType, dependentEntityType: EntityType, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasNavigations(navigationToPrincipal: MemberInfo, navigationToDependent: MemberInfo, principalEntityType: EntityType, dependentEntityType: EntityType, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<ForeignKey, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasPrincipalKey(members: IReadOnlyList_1<MemberInfo>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasPrincipalKey(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
     HasPrincipalKey(properties: IReadOnlyList_1<Property>, configurationSource: ConfigurationSource): InternalForeignKeyBuilder | undefined;
@@ -3747,16 +2933,8 @@ export interface InternalIndexBuilder$instance extends AnnotatableBuilder_2<Inde
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionIndexBuilder: never;
 
     Attach(entityTypeBuilder: InternalEntityTypeBuilder): InternalIndexBuilder | undefined;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetIsDescending(descending: IReadOnlyList_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsUnique(unique: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Index, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Index, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     IsDescending(descending: IReadOnlyList_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalIndexBuilder | undefined;
     IsUnique(unique: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalIndexBuilder | undefined;
 }
@@ -3782,14 +2960,6 @@ export interface InternalKeyBuilder$instance extends AnnotatableBuilder_2<Key, I
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionKeyBuilder: never;
 
     Attach(entityTypeBuilder: InternalEntityTypeBuilder, primaryKeyConfigurationSource: Nullable_1<ConfigurationSource>): InternalKeyBuilder | undefined;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Key, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Key, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -3816,11 +2986,7 @@ export interface InternalModelBuilder$instance extends AnnotatableBuilder_2<Mode
     CanHaveEntity(type: TypeIdentity, configurationSource: ConfigurationSource, shouldBeOwned: Nullable_1<System_Internal.Boolean>, shouldThrow?: boolean): boolean;
     CanIgnore(type: Type, configurationSource: ConfigurationSource): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
     CanRemoveEntityType(entityType: EntityType, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): boolean;
     CanSetEmbeddedDiscriminatorName(name: string, configurationSource: ConfigurationSource): boolean;
     CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): boolean;
@@ -3829,12 +2995,8 @@ export interface InternalModelBuilder$instance extends AnnotatableBuilder_2<Mode
     Entity(type: Type, configurationSource: ConfigurationSource, shouldBeOwned?: Nullable_1<System_Internal.Boolean>): InternalEntityTypeBuilder | undefined;
     Entity(name: string, definingNavigationName: string, definingEntityType: EntityType, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
     Entity(type: Type, definingNavigationName: string, definingEntityType: EntityType, configurationSource: ConfigurationSource): InternalEntityTypeBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Model, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): InternalModelBuilder | undefined;
     HasEmbeddedDiscriminatorName(name: string, configurationSource: ConfigurationSource): InternalModelBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Model, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasNoEntityType(entityType: EntityType, configurationSource: ConfigurationSource): InternalModelBuilder | undefined;
     Ignore(type: Type, configurationSource: ConfigurationSource): InternalModelBuilder | undefined;
     Ignore(name: string, configurationSource: ConfigurationSource): InternalModelBuilder | undefined;
@@ -3868,25 +3030,15 @@ export interface InternalNavigationBuilder$instance extends InternalPropertyBase
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionPropertyBaseBuilder_1: never;
 
     AutoInclude(autoInclude: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
     CanSetAutoInclude(autoInclude: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
-    CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
     CanSetLazyLoadingEnabled(lazyLoadingEnabled: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
-    CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     EnableLazyLoading(lazyLoadingEnabled: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     HasField(fieldName: string, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
-    HasField(fieldName: string, configurationSource: ConfigurationSource): IConventionNavigationBuilder;
+    HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
     HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): IConventionNavigationBuilder;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     IsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
+    UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): InternalNavigationBuilder | undefined;
     UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): IConventionNavigationBuilder;
 }
 
@@ -3926,19 +3078,11 @@ export interface InternalPropertyBaseBuilder_2$instance<TBuilder extends IConven
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
 
     readonly This: TBuilder;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<TPropertyBase, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasField(fieldName: string, configurationSource: ConfigurationSource): TBuilder | undefined;
     HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): TBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<TPropertyBase, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): TBuilder | undefined;
 }
 
@@ -3964,24 +3108,17 @@ export interface InternalPropertyBuilder$instance extends InternalPropertyBaseBu
     AfterSave(behavior: Nullable_1<PropertySaveBehavior>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     Attach(typeBaseBuilder: InternalTypeBaseBuilder): InternalPropertyBuilder | undefined;
     BeforeSave(behavior: Nullable_1<PropertySaveBehavior>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
     CanSetAfterSave(behavior: Nullable_1<PropertySaveBehavior>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
     CanSetBeforeSave(behavior: Nullable_1<PropertySaveBehavior>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetConversion(converter: ValueConverter, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetConversion(providerClrType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetConverter(converterType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetElementType(elementType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsConcurrencyToken(concurrencyToken: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetIsUnicode(unicode: Nullable_1<System_Internal.Boolean>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetMaxLength(maxLength: Nullable_1<System_Internal.Int32>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetPrecision(precision: Nullable_1<System_Internal.Int32>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetProviderValueComparer(comparer: ValueComparer, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetProviderValueComparer(comparerType: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetScale(scale: Nullable_1<System_Internal.Int32>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
@@ -3992,17 +3129,13 @@ export interface InternalPropertyBuilder$instance extends InternalPropertyBaseBu
     CanSetValueGenerated(valueGenerated: Nullable_1<ValueGenerated>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetValueGenerator(factory: Func_3<IProperty, IEntityType, ValueGenerator>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetValueGeneratorFactory(factory: Type, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     HasConversion(converter: ValueConverter, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasConversion(providerClrType: Type, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasConverter(converterType: Type, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasField(fieldName: string, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
-    HasField(fieldName: string, configurationSource: ConfigurationSource): IConventionPropertyBuilder;
+    HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): IConventionPropertyBuilder;
     HasMaxLength(maxLength: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     HasPrecision(precision: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasProviderValueComparer(comparer: ValueComparer, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     HasProviderValueComparer(comparerType: Type, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
@@ -4018,6 +3151,7 @@ export interface InternalPropertyBuilder$instance extends InternalPropertyBaseBu
     IsRequired(required: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     IsUnicode(unicode: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     SetElementType(elementType: Type, configurationSource: ConfigurationSource): InternalElementTypeBuilder | undefined;
+    UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): IConventionPropertyBuilder;
     ValueGenerated(valueGenerated: Nullable_1<ValueGenerated>, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
 }
@@ -4043,16 +3177,8 @@ export interface InternalRelationalPropertyOverridesBuilder$instance extends Ann
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionRelationalPropertyOverridesBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetColumnName(name: string, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<RelationalPropertyOverrides, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasColumnName(name: string, configurationSource: ConfigurationSource): InternalRelationalPropertyOverridesBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<RelationalPropertyOverrides, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -4075,22 +3201,14 @@ export interface InternalSequenceBuilder$instance extends AnnotatableBuilder_2<S
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionSequenceBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetIncrementsBy(increment: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): boolean;
     CanSetIsCyclic(cyclic: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
     CanSetMax(maximum: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): boolean;
     CanSetMin(minimum: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): boolean;
     CanSetStartsAt(startValue: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): boolean;
     CanSetType(type: Type, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Sequence, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasMax(maximum: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): IConventionSequenceBuilder | undefined;
     HasMin(minimum: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): IConventionSequenceBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Sequence, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasType(type: Type, configurationSource: ConfigurationSource): IConventionSequenceBuilder | undefined;
     IncrementsBy(increment: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): IConventionSequenceBuilder | undefined;
     IsCyclic(cyclic: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): IConventionSequenceBuilder | undefined;
@@ -4119,22 +3237,12 @@ export interface InternalServicePropertyBuilder$instance extends InternalPropert
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionServicePropertyBuilder: never;
 
     Attach(entityTypeBuilder: InternalEntityTypeBuilder): InternalServicePropertyBuilder | undefined;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetParameterBinding(parameterBinding: ServiceParameterBinding, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     HasField(fieldName: string, configurationSource: ConfigurationSource): InternalServicePropertyBuilder | undefined;
-    HasField(fieldName: string, configurationSource: ConfigurationSource): IConventionServicePropertyBuilder;
+    HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): InternalServicePropertyBuilder | undefined;
     HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): IConventionServicePropertyBuilder;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
     HasParameterBinding(parameterBinding: ServiceParameterBinding, configurationSource: ConfigurationSource): InternalServicePropertyBuilder | undefined;
+    UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): InternalServicePropertyBuilder | undefined;
     UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): IConventionServicePropertyBuilder;
 }
 
@@ -4162,27 +3270,13 @@ export interface InternalSkipNavigationBuilder$instance extends InternalProperty
 
     Attach(entityTypeBuilder?: InternalEntityTypeBuilder, targetEntityType?: EntityType, inverseBuilder?: InternalSkipNavigationBuilder): InternalSkipNavigationBuilder | undefined;
     AutoInclude(autoInclude: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalSkipNavigationBuilder | undefined;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
     CanSetAutoInclude(autoInclude: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
-    CanSetField(fieldName: string, configurationSource: Nullable_1<ConfigurationSource>): boolean;
-    CanSetField(fieldInfo: FieldInfo, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetForeignKey(foreignKey: ForeignKey, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetInverse(inverse: SkipNavigation, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     CanSetLazyLoadingEnabled(lazyLoadingEnabled: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): boolean;
-    CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: Nullable_1<ConfigurationSource>): boolean;
     EnableLazyLoading(lazyLoadingEnabled: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): InternalSkipNavigationBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
-    HasField(fieldName: string, configurationSource: ConfigurationSource): IConventionSkipNavigationBuilder;
-    HasField(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): IConventionSkipNavigationBuilder;
     HasForeignKey(foreignKey: ForeignKey, configurationSource: ConfigurationSource): InternalSkipNavigationBuilder | undefined;
     HasInverse(inverse: SkipNavigation, configurationSource: ConfigurationSource): InternalSkipNavigationBuilder | undefined;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<unknown, unknown>;
-    UsePropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): IConventionSkipNavigationBuilder;
 }
 
 
@@ -4212,18 +3306,10 @@ export interface InternalStoredProcedureBuilder$instance extends AnnotatableBuil
     CanHaveRowsAffectedParameter(configurationSource: ConfigurationSource): boolean;
     CanHaveRowsAffectedResultColumn(configurationSource: ConfigurationSource): boolean;
     CanHaveRowsAffectedReturn(rowsAffectedReturned: boolean, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetName(name: string, configurationSource: ConfigurationSource): boolean;
     CanSetSchema(schema: string, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedure, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasName(name: string, configurationSource: ConfigurationSource): InternalStoredProcedureBuilder | undefined;
     HasName(name: string, schema: string, configurationSource: ConfigurationSource): InternalStoredProcedureBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedure, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasOriginalValueParameter(propertyName: string, configurationSource: ConfigurationSource): InternalStoredProcedureParameterBuilder | undefined;
     HasOriginalValueParameter<TDerivedEntity, TProperty>(propertyExpression: Expression_1<Func_2<TDerivedEntity, TProperty>>, configurationSource: ConfigurationSource): InternalStoredProcedureParameterBuilder | undefined;
     HasParameter(propertyName: string, configurationSource: ConfigurationSource): InternalStoredProcedureParameterBuilder | undefined;
@@ -4258,18 +3344,10 @@ export interface InternalStoredProcedureParameterBuilder$instance extends Annota
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionStoredProcedureParameterBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetDirection(direction: ParameterDirection, configurationSource: ConfigurationSource): boolean;
     CanSetName(name: string, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedureParameter, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasDirection(direction: ParameterDirection, configurationSource: ConfigurationSource): InternalStoredProcedureParameterBuilder | undefined;
     HasName(name: string, configurationSource: ConfigurationSource): InternalStoredProcedureParameterBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedureParameter, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -4292,16 +3370,8 @@ export interface InternalStoredProcedureResultColumnBuilder$instance extends Ann
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionAnnotatableBuilder: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionStoredProcedureResultColumnBuilder: never;
 
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetName(name: string, configurationSource: ConfigurationSource): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedureResultColumn, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasName(name: string, configurationSource: ConfigurationSource): InternalStoredProcedureResultColumnBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<StoredProcedureResultColumn, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -4325,14 +3395,6 @@ export interface InternalTriggerBuilder$instance extends AnnotatableBuilder_2<Tr
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Builders_IConventionTriggerBuilder: never;
 
     Attach(entityTypeBuilder: InternalEntityTypeBuilder): InternalTriggerBuilder | undefined;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Trigger, IConventionModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<Trigger, IConventionModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
 }
 
 
@@ -4361,13 +3423,9 @@ export interface InternalTypeBaseBuilder$instance extends AnnotatableBuilder_2<T
     CanHaveProperty(propertyType: Type, propertyName: string, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: Nullable_1<ConfigurationSource>, checkClrProperty?: boolean): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource): boolean;
     CanIgnore(name: string, configurationSource: ConfigurationSource, shouldThrow: boolean): boolean;
-    CanRemoveAnnotation(name: string, configurationSource: ConfigurationSource): boolean;
-    CanRemoveAnnotation(name: string, fromDataAnnotation?: boolean): boolean;
     CanRemoveComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): boolean;
     CanRemoveDiscriminator(configurationSource: ConfigurationSource): boolean;
     CanRemoveProperty(property: Property, configurationSource: ConfigurationSource, canOverrideSameSource?: boolean): boolean;
-    CanSetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): boolean;
-    CanSetAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): boolean;
     CanSetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): boolean;
     CanSetDiscriminator(name: string, type: Type, configurationSource: ConfigurationSource): boolean;
     CanSetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): boolean;
@@ -4384,11 +3442,7 @@ export interface InternalTypeBaseBuilder$instance extends AnnotatableBuilder_2<T
     GetOrCreateDiscriminatorProperty(type: Type, name: string, memberInfo: MemberInfo, configurationSource: ConfigurationSource): InternalPropertyBuilder | undefined;
     GetOrCreateProperties(propertyNames: IReadOnlyList_1<System_Internal.String>, configurationSource: Nullable_1<ConfigurationSource>, referencedProperties?: IReadOnlyList_1<Property>, required?: boolean, useDefaultType?: boolean): IReadOnlyList_1<Property> | undefined;
     GetOrCreateProperties(clrMembers: IEnumerable_1<MemberInfo>, configurationSource: Nullable_1<ConfigurationSource>): IReadOnlyList_1<Property> | undefined;
-    HasAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): AnnotatableBuilder_2<TypeBase, InternalModelBuilder>;
-    HasAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
-    HasNoAnnotation(name: string, configurationSource: ConfigurationSource): AnnotatableBuilder_2<TypeBase, InternalModelBuilder>;
-    HasNoAnnotation(name: string, fromDataAnnotation?: boolean): IConventionAnnotatableBuilder | undefined;
     HasNoComplexProperty(complexProperty: ComplexProperty, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
     HasNoDiscriminator(configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
     Ignore(name: string, configurationSource: ConfigurationSource): InternalTypeBaseBuilder | undefined;
@@ -4438,32 +3492,7 @@ export interface JsonColumn$instance extends Column$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IColumnBase: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMapping | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
-    TryGetDefaultValue(defaultValue: unknown): boolean;
 }
 
 
@@ -4491,30 +3520,7 @@ export interface JsonColumnBase$instance extends ColumnBase_1$instance<ColumnMap
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IColumnBase: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
 
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
 }
 
 
@@ -4542,31 +3548,7 @@ export interface JsonViewColumn$instance extends ViewColumn$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IMutableAnnotatable: never;
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IViewColumn: never;
 
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IViewColumnMapping | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
 }
 
 
@@ -4607,37 +3589,10 @@ export interface Key$instance extends ConventionAnnotatable {
     readonly Properties: IReadOnlyList_1<Property>;
     get ReferencingForeignKeys(): ISet_1<ForeignKey> | undefined;
     set ReferencingForeignKeys(value: ISet_1<ForeignKey> | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetReferencingForeignKeys(): IEnumerable_1<ForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
     UpdateConfigurationSource(configurationSource: ConfigurationSource): void;
@@ -4712,14 +3667,6 @@ export interface Model$instance extends ConventionAnnotatable {
     get ScopedModelDependencies(): ModelDependencies | undefined;
     set ScopedModelDependencies(value: ModelDependencies | undefined);
     SkipDetectChanges: boolean;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddComplex(type: Type, configurationSource: ConfigurationSource): Nullable_1<ConfigurationSource>;
     AddComplexType(complexType: ComplexType): void;
     AddEntityType(name: string, owned: boolean, configurationSource: ConfigurationSource): EntityType | undefined;
@@ -4732,18 +3679,10 @@ export interface Model$instance extends ConventionAnnotatable {
     AddIgnored(name: string, type: Type, configurationSource: ConfigurationSource): string | undefined;
     AddOwned(type: Type, configurationSource: ConfigurationSource): void;
     AddProperty(property: Property): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
     AddShared(type: Type, configurationSource: ConfigurationSource): void;
-    AnnotationsToDebugString(indent?: int): string;
     DelayConventions(): IConventionBatch;
     FinalizeModel(): IModel;
     FindActualEntityType(entityType: EntityType): EntityType | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindClrType(name: string): Type | undefined;
     FindComplexType(name: string): ComplexType | undefined;
     FindEntityType(type: Type): EntityType | undefined;
@@ -4758,11 +3697,7 @@ export interface Model$instance extends ConventionAnnotatable {
     FindIsOwnedConfigurationSource(type: Type): Nullable_1<ConfigurationSource>;
     FindIsSharedConfigurationSource(type: Type): Nullable_1<ConfigurationSource>;
     FindProperties(type: Type): IReadOnlySet_1<Property> | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
     FindTypeMappingConfiguration(propertyType: Type): ITypeMappingConfiguration | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetChangeTrackingStrategy(): ChangeTrackingStrategy;
     GetChangeTrackingStrategyConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetDisplayName(type: Type): string;
@@ -4770,10 +3705,8 @@ export interface Model$instance extends ConventionAnnotatable {
     GetEmbeddedDiscriminatorNameConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetEntityTypes(): IEnumerable_1<EntityType>;
     GetEntityTypes(name: string): IEnumerable_1<EntityType>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPropertyAccessMode(): PropertyAccessMode;
     GetPropertyAccessModeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMappingConfigurations(): IEnumerable_1<ITypeMappingConfiguration>;
     IsIgnored(name: string): boolean;
     IsIgnored(type: Type): boolean;
@@ -4784,8 +3717,6 @@ export interface Model$instance extends ConventionAnnotatable {
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnModelFinalized(): IModel;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
     RemoveComplexType(complexType: ComplexType): void;
     RemoveEntityType(type: Type): EntityType | undefined;
     RemoveEntityType(name: string): EntityType | undefined;
@@ -4797,9 +3728,6 @@ export interface Model$instance extends ConventionAnnotatable {
     RemoveOwned(type: Type): string | undefined;
     RemoveProperty(property: Property): Property | undefined;
     RemoveShared(type: Type): Type | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): Nullable_1<ChangeTrackingStrategy>;
     SetEmbeddedDiscriminatorName(name: string, configurationSource: ConfigurationSource): string | undefined;
     SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
@@ -4915,59 +3843,13 @@ export interface Navigation$instance extends PropertyBase$instance {
     readonly IsOnDependent: boolean;
     readonly Sentinel: unknown | undefined;
     readonly TargetEntityType: EntityType;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetCollectionAccessor(): IClrCollectionAccessor | undefined;
     GetConfigurationSource(): ConfigurationSource;
-    GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
-    GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldName(): string | undefined;
-    GetGetter(): IClrPropertyGetter;
-    GetIndex(): int;
-    GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
     GetInverseConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetMemberInfo(forMaterialization: boolean, forSet: boolean): MemberInfo;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPropertyAccessMode(): PropertyAccessMode;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    GetSetter(): IClrPropertySetter;
-    GetShadowIndex(): int;
-    IsShadowProperty(): boolean;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetField(fieldName: string): void;
-    SetField(fieldName: string, fromDataAnnotation?: boolean): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, fromDataAnnotation?: boolean): FieldInfo | undefined;
     SetInverse(inverseName: string, configurationSource: ConfigurationSource): Navigation | undefined;
     SetInverse(inverse: MemberInfo, configurationSource: ConfigurationSource): Navigation | undefined;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>): void;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, fromDataAnnotation?: boolean): Nullable_1<PropertyAccessMode>;
     SetRemovedFromModel(): void;
     ToString(): string;
     UpdateConfigurationSource(configurationSource: ConfigurationSource): void;
@@ -5077,47 +3959,19 @@ export interface Property$instance extends PropertyBase$instance {
     get TypeMapping(): CoreTypeMapping | undefined;
     set TypeMapping(value: CoreTypeMapping | undefined);
     ValueGenerated: ValueGenerated;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
     CheckAfterSaveBehavior(behavior: PropertySaveBehavior): string | undefined;
     CheckValueComparer(comparer: ValueComparer): string | undefined;
     CheckValueConverter(converter: ValueConverter): string | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
     GetAfterSaveBehavior(): PropertySaveBehavior;
     GetAfterSaveBehaviorConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetBeforeSaveBehavior(): PropertySaveBehavior;
     GetBeforeSaveBehaviorConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetCollectionAccessor(): IClrCollectionAccessor | undefined;
-    GetConfigurationSource(): ConfigurationSource;
     GetContainingForeignKeys(): IEnumerable_1<ForeignKey>;
     GetContainingIndexes(): IEnumerable_1<Index>;
     GetContainingKeys(): IEnumerable_1<Key>;
     GetConversion(throwOnValueConverterConflict?: boolean, throwOnProviderClrTypeConflict?: boolean): ValueTuple_3<ValueConverter, Type, Type>;
-    GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
     GetElementType(): ElementType | undefined;
     GetElementTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldName(): string | undefined;
-    GetGetter(): IClrPropertyGetter;
-    GetIndex(): int;
-    GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
     GetIsConcurrencyTokenConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsNullableConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsUnicodeConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -5126,21 +3980,15 @@ export interface Property$instance extends PropertyBase$instance {
     GetKeyValueComparer(): ValueComparer | undefined;
     GetMaxLength(): Nullable_1<System_Internal.Int32>;
     GetMaxLengthConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetMemberInfo(forMaterialization: boolean, forSet: boolean): MemberInfo;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPrecision(): Nullable_1<System_Internal.Int32>;
     GetPrecisionConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetPropertyAccessMode(): PropertyAccessMode;
     GetProviderClrType(): Type | undefined;
     GetProviderClrTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetProviderValueComparer(): ValueComparer | undefined;
     GetProviderValueComparerConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetScale(): Nullable_1<System_Internal.Int32>;
     GetScaleConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetSentinelConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetSetter(): IClrPropertySetter;
-    GetShadowIndex(): int;
     GetTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTypeMappingConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetValueComparer(): ValueComparer;
@@ -5153,35 +4001,21 @@ export interface Property$instance extends PropertyBase$instance {
     IsForeignKey(): boolean;
     IsIndex(): boolean;
     IsKey(): boolean;
-    IsShadowProperty(): boolean;
     IsUnicode(): Nullable_1<System_Internal.Boolean>;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     OnElementTypeSet(newElementType: IElementType, oldElementType: IElementType): IElementType | undefined;
     OnFieldInfoSet(newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo): FieldInfo | undefined;
     OnPropertyNullableChanged(): Nullable_1<System_Internal.Boolean>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
     SetAfterSaveBehavior(afterSaveBehavior: Nullable_1<PropertySaveBehavior>, configurationSource: ConfigurationSource): Nullable_1<PropertySaveBehavior>;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetBeforeSaveBehavior(beforeSaveBehavior: Nullable_1<PropertySaveBehavior>, configurationSource: ConfigurationSource): Nullable_1<PropertySaveBehavior>;
     SetElementType(elementType: Type, configurationSource: ConfigurationSource): ElementType | undefined;
-    SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetField(fieldName: string): void;
-    SetField(fieldName: string, fromDataAnnotation?: boolean): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, fromDataAnnotation?: boolean): FieldInfo | undefined;
     SetIsConcurrencyToken(concurrencyToken: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetIsNullable(nullable: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetIsUnicode(unicode: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetJsonValueReaderWriterType(readerWriterType: Type, configurationSource: ConfigurationSource): Type | undefined;
     SetMaxLength(maxLength: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Int32>;
     SetPrecision(precision: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Int32>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>): void;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, fromDataAnnotation?: boolean): Nullable_1<PropertyAccessMode>;
     SetProviderClrType(providerClrType: Type, configurationSource: ConfigurationSource): Type | undefined;
     SetProviderValueComparer(comparer: ValueComparer, configurationSource: ConfigurationSource): ValueComparer | undefined;
     SetProviderValueComparer(comparerType: Type, configurationSource: ConfigurationSource): Type | undefined;
@@ -5293,41 +4127,14 @@ export interface PropertyBase$instance extends ConventionAnnotatable {
     readonly Name: string;
     PropertyIndexes: PropertyIndexes;
     readonly PropertyInfo: PropertyInfo | undefined;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
     GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPropertyAccessMode(): PropertyAccessMode;
     GetPropertyAccessModeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetSetter(): IClrPropertySetter;
     OnFieldInfoSet(newFieldInfo: FieldInfo, oldFieldInfo: FieldInfo): FieldInfo | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetConfigurationSource(configurationSource: ConfigurationSource): void;
     SetCurrentValueComparer(comparer: IComparer_1<IUpdateEntry>): void;
     SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
@@ -5365,22 +4172,10 @@ export interface PropertyConfiguration$instance extends AnnotatableBase {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_ITypeMappingConfiguration: never;
 
     readonly ClrType: Type;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AnnotationsToDebugString(indent?: int): string;
     Apply(property: IMutableProperty): void;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<Annotation>;
     GetMaxLength(): Nullable_1<System_Internal.Int32>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPrecision(): Nullable_1<System_Internal.Int32>;
     GetProviderClrType(): Type | undefined;
-    GetRuntimeAnnotations(): IEnumerable_1<Annotation>;
     GetScale(): Nullable_1<System_Internal.Int32>;
     GetValueConverter(): ValueConverter | undefined;
     IsUnicode(): Nullable_1<System_Internal.Boolean>;
@@ -5601,34 +4396,13 @@ export interface RelationalModel$instance extends Annotatable {
     readonly StoredProcedures: Dictionary_2<ValueTuple_2<System_Internal.String, System_Internal.String>, StoreStoredProcedure>;
     readonly Tables: Dictionary_2<ValueTuple_2<System_Internal.String, System_Internal.String>, Table>;
     readonly Views: Dictionary_2<ValueTuple_2<System_Internal.String, System_Internal.String>, View>;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindDefaultTable(name: string): TableBase | undefined;
     FindFunction(name: string, schema: string, parameters: IReadOnlyList_1<System_Internal.String>): IStoreFunction | undefined;
     FindQuery(name: string): ISqlQuery | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
     FindStoredProcedure(name: string, schema: string): IStoreStoredProcedure | undefined;
     FindTable(name: string, schema: string): ITable | undefined;
     FindView(name: string, schema: string): IView | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     MakeReadOnly(): RelationalModel;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
 }
 
 
@@ -5683,35 +4457,8 @@ export interface RelationalPropertyOverrides$instance extends ConventionAnnotata
     readonly IsReadOnly: boolean;
     readonly Property: IReadOnlyProperty;
     readonly StoreObject: StoreObjectIdentifier;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetColumnNameConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetConfigurationSource(): ConfigurationSource;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetColumnName(columnName: string, configurationSource: ConfigurationSource): string | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
@@ -5794,18 +4541,6 @@ export interface RuntimeStoredProcedureParameter$instance extends AnnotatableBas
 
     readonly DebugView: DebugView;
     readonly StoredProcedure: RuntimeStoredProcedure;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<Annotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<Annotation>;
     ToString(): string;
 }
 
@@ -5835,18 +4570,6 @@ export interface RuntimeStoredProcedureResultColumn$instance extends Annotatable
 
     readonly DebugView: DebugView;
     readonly StoredProcedure: RuntimeStoredProcedure;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<Annotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<Annotation>;
     ToString(): string;
 }
 
@@ -5890,40 +4613,13 @@ export interface Sequence$instance extends ConventionAnnotatable {
     readonly Schema: string | undefined;
     StartValue: long;
     Type: Type;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetIncrementByConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetIsCyclicConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetMaxValueConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetMinValueConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetStartValueConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIncrementBy(incrementBy: Nullable_1<System_Internal.Int32>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Int32>;
     SetIsCyclic(cyclic: Nullable_1<System_Internal.Boolean>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Boolean>;
     SetMaxValue(maxValue: Nullable_1<System_Internal.Int64>, configurationSource: ConfigurationSource): Nullable_1<System_Internal.Int64>;
@@ -5993,56 +4689,8 @@ export interface ServiceProperty$instance extends PropertyBase$instance {
     readonly IsInModel: boolean;
     ParameterBinding: ServiceParameterBinding;
     readonly Sentinel: unknown | undefined;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetCollectionAccessor(): IClrCollectionAccessor | undefined;
-    GetConfigurationSource(): ConfigurationSource;
-    GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
-    GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldName(): string | undefined;
-    GetGetter(): IClrPropertyGetter;
-    GetIndex(): int;
-    GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
-    GetMemberInfo(forMaterialization: boolean, forSet: boolean): MemberInfo;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetParameterBindingConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetPropertyAccessMode(): PropertyAccessMode;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    GetSetter(): IClrPropertySetter;
-    GetShadowIndex(): int;
-    IsShadowProperty(): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetField(fieldName: string): void;
-    SetField(fieldName: string, fromDataAnnotation?: boolean): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, fromDataAnnotation?: boolean): FieldInfo | undefined;
     SetParameterBinding(parameterBinding: ServiceParameterBinding, configurationSource: ConfigurationSource): ServiceParameterBinding | undefined;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>): void;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, fromDataAnnotation?: boolean): Nullable_1<PropertyAccessMode>;
     SetRemovedFromModel(): void;
     ToString(): string;
 }
@@ -6108,60 +4756,13 @@ export interface SkipNavigation$instance extends PropertyBase$instance {
     readonly ManyToManyLoader: ICollectionLoader;
     readonly Sentinel: unknown | undefined;
     readonly TargetEntityType: EntityType;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetCollectionAccessor(): IClrCollectionAccessor | undefined;
-    GetConfigurationSource(): ConfigurationSource;
-    GetCurrentValueComparer(): IComparer_1<IUpdateEntry>;
-    GetFieldInfoConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetFieldName(): string | undefined;
     GetForeignKeyConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetGetter(): IClrPropertyGetter;
-    GetIndex(): int;
-    GetIndexedCollectionAccessor(): IClrIndexedCollectionAccessor;
     GetInverseConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetMemberInfo(forMaterialization: boolean, forSet: boolean): MemberInfo;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetPropertyAccessMode(): PropertyAccessMode;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    GetSetter(): IClrPropertySetter;
-    GetShadowIndex(): int;
-    IsShadowProperty(): boolean;
     OnAnnotationSet(name: string, annotation: IConventionAnnotation, oldAnnotation: IConventionAnnotation): IConventionAnnotation | undefined;
     OnAnnotationSet(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    SetField(fieldName: string, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetField(fieldName: string): void;
-    SetField(fieldName: string, fromDataAnnotation?: boolean): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, configurationSource: ConfigurationSource): FieldInfo | undefined;
-    SetFieldInfo(fieldInfo: FieldInfo, fromDataAnnotation?: boolean): FieldInfo | undefined;
     SetForeignKey(foreignKey: ForeignKey, configurationSource: ConfigurationSource): ForeignKey | undefined;
     SetInverse(inverse: SkipNavigation, configurationSource: ConfigurationSource): SkipNavigation | undefined;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, configurationSource: ConfigurationSource): Nullable_1<PropertyAccessMode>;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>): void;
-    SetPropertyAccessMode(propertyAccessMode: Nullable_1<PropertyAccessMode>, fromDataAnnotation?: boolean): Nullable_1<PropertyAccessMode>;
     SetRemovedFromModel(): void;
     ToString(): string;
     UpdateForeignKeyConfigurationSource(configurationSource: ConfigurationSource): void;
@@ -6223,33 +4824,8 @@ export interface SqlQuery$instance extends TableBase$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_ITableBase: never;
 
     Sql: string;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
     FindColumn(name: string): SqlQueryColumn | undefined;
-    FindColumn(name: string): IColumnBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRowInternalForeignKeys(entityType: IEntityType): IEnumerable_1<IForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -6280,29 +4856,6 @@ export interface SqlQueryColumn$instance extends ColumnBase_1$instance<SqlQueryC
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_ISqlQueryColumn: never;
 
     readonly SqlQuery: SqlQuery;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -6333,28 +4886,7 @@ export interface SqlQueryColumnMapping$instance extends ColumnMappingBase$instan
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_ISqlQueryColumnMapping: never;
 
     readonly SqlQueryMapping: ISqlQueryMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -6386,28 +4918,6 @@ export interface SqlQueryMapping$instance extends TableMappingBase_1$instance<Sq
 
     IsDefaultSqlQueryMapping: boolean;
     readonly SqlQuery: ISqlQuery;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -6450,46 +4960,19 @@ export interface StoredProcedure$instance extends ConventionAnnotatable {
     readonly ResultColumns: IReadOnlyList_1<StoredProcedureResultColumn>;
     get Schema(): string | undefined;
     set Schema(value: string | undefined);
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddOriginalValueParameter(propertyName: string): StoredProcedureParameter;
     AddParameter(propertyName: string): StoredProcedureParameter;
     AddResultColumn(propertyName: string): StoredProcedureResultColumn;
     AddRowsAffectedParameter(): StoredProcedureParameter;
     AddRowsAffectedResultColumn(): StoredProcedureResultColumn;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindOriginalValueParameter(propertyName: string): StoredProcedureParameter | undefined;
     FindParameter(propertyName: string): StoredProcedureParameter | undefined;
     FindResultColumn(propertyName: string): StoredProcedureResultColumn | undefined;
     FindRowsAffectedParameter(): StoredProcedureParameter | undefined;
     FindRowsAffectedResultColumn(): StoredProcedureResultColumn | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
     GetNameConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetSchemaConfigurationSource(): Nullable_1<ConfigurationSource>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsRowsAffectedReturned(rowsAffectedReturned: boolean): boolean;
     SetName(name: string, configurationSource: ConfigurationSource): string | undefined;
     SetName(name: string, schema: string, configurationSource: ConfigurationSource, skipOverrides?: boolean): void;
@@ -6562,29 +5045,7 @@ export interface StoredProcedureMapping$instance extends TableMappingBase_1$inst
     readonly StoredProcedureIdentifier: StoreObjectIdentifier;
     readonly StoreStoredProcedure: IStoreStoredProcedure;
     readonly TableMapping: ITableMapping | undefined;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddParameterMapping(parameterMapping: IStoredProcedureParameterMapping): boolean;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -6627,36 +5088,9 @@ export interface StoredProcedureParameter$instance extends ConventionAnnotatable
     readonly PropertyName: string | undefined;
     readonly StoredProcedure: StoredProcedure;
     StoreParameter: IStoreStoredProcedureParameter;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetDirectionConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetNameConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     IsValid(direction: ParameterDirection): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetDirection(direction: ParameterDirection, configurationSource: ConfigurationSource): ParameterDirection;
     SetName(name: string, configurationSource: ConfigurationSource): string;
     SetRemovedFromModel(): void;
@@ -6695,28 +5129,7 @@ export interface StoredProcedureParameterMapping$instance extends ColumnMappingB
     readonly DebugView: DebugView;
     readonly Parameter: IStoredProcedureParameter;
     readonly StoredProcedureMapping: IStoredProcedureMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -6757,34 +5170,7 @@ export interface StoredProcedureResultColumn$instance extends ConventionAnnotata
     readonly PropertyName: string | undefined;
     readonly StoredProcedure: StoredProcedure;
     StoreResultColumn: IStoreStoredProcedureResultColumn;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetNameConfigurationSource(): Nullable_1<ConfigurationSource>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetName(name: string, configurationSource: ConfigurationSource): string | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
@@ -6822,28 +5208,7 @@ export interface StoredProcedureResultColumnMapping$instance extends ColumnMappi
     readonly DebugView: DebugView;
     readonly ResultColumn: IStoredProcedureResultColumn;
     readonly StoredProcedureMapping: IStoredProcedureMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -6877,35 +5242,10 @@ export interface StoreFunction$instance extends TableBase$instance {
     readonly IsBuiltIn: boolean;
     readonly Parameters: StoreFunctionParameter[];
     readonly ReturnType: string | undefined;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddDbFunction(dbFunction: IRuntimeDbFunction): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
     FindColumn(name: string): FunctionColumn | undefined;
-    FindColumn(name: string): IColumnBase | undefined;
     FindParameter(propertyName: string): StoreFunctionParameter | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRowInternalForeignKeys(entityType: IEntityType): IEnumerable_1<IForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -6939,27 +5279,6 @@ export interface StoreFunctionParameter$instance extends Annotatable {
     readonly IsReadOnly: boolean;
     readonly Name: string;
     readonly StoreType: string;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -6994,39 +5313,15 @@ export interface StoreStoredProcedure$instance extends TableBase$instance {
     get ReturnValue(): IStoreStoredProcedureReturnValue | undefined;
     set ReturnValue(value: IStoreStoredProcedureReturnValue | undefined);
     readonly StoredProcedures: SortedSet_1<IStoredProcedure>;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddParameter(parameter: IStoreStoredProcedureParameter): void;
     AddResultColumn(column: IStoreStoredProcedureResultColumn): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
     AddStoredProcedure(storedProcedure: IRuntimeStoredProcedure): void;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
     FindColumn(name: string): IColumnBase | undefined;
     FindParameter(name: string): IStoreStoredProcedureParameter | undefined;
     FindParameter(property: IProperty): IStoreStoredProcedureParameter | undefined;
     FindResultColumn(name: string): IStoreStoredProcedureResultColumn | undefined;
     FindResultColumn(property: IProperty): IStoreStoredProcedureResultColumn | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRowInternalForeignKeys(entityType: IEntityType): IEnumerable_1<IForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7060,30 +5355,7 @@ export interface StoreStoredProcedureParameter$instance extends ColumnBase_1$ins
     readonly Direction: ParameterDirection;
     readonly Position: int;
     readonly StoredProcedure: StoreStoredProcedure;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7116,30 +5388,7 @@ export interface StoreStoredProcedureResultColumn$instance extends ColumnBase_1$
     readonly DebugView: DebugView;
     readonly Position: int;
     readonly StoredProcedure: StoreStoredProcedure;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7171,30 +5420,7 @@ export interface StoreStoredProcedureReturnValue$instance extends ColumnBase_1$i
 
     readonly DebugView: DebugView;
     readonly StoredProcedure: StoreStoredProcedure;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
     GetDefaultStoreTypeMapping(): RelationalTypeMapping;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7233,34 +5459,9 @@ export interface Table$instance extends TableBase$instance {
     readonly ReferencingForeignKeyConstraints: SortedSet_1<ForeignKeyConstraint>;
     readonly Triggers: SortedDictionary_2<System_Internal.String, ITrigger>;
     readonly UniqueConstraints: SortedDictionary_2<System_Internal.String, UniqueConstraint>;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
     FindColumn(name: string): Column | undefined;
-    FindColumn(name: string): IColumnBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
     FindUniqueConstraint(name: string): UniqueConstraint | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRowInternalForeignKeys(entityType: IEntityType): IEnumerable_1<IForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7303,32 +5504,11 @@ export interface TableBase$instance extends Annotatable {
     get RowInternalForeignKeys(): SortedDictionary_2<IEntityType, IEnumerable_1<IForeignKey>> | undefined;
     set RowInternalForeignKeys(value: SortedDictionary_2<IEntityType, IEnumerable_1<IForeignKey>> | undefined);
     readonly Schema: string | undefined;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddRowInternalForeignKey(entityType: IEntityType, foreignKey: IForeignKey): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
     AddTypeMapping(tableMapping: ITableMappingBase, optional: Nullable_1<System_Internal.Boolean>): void;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(name: string): IColumnBase | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -7381,28 +5561,7 @@ export interface TableIndex$instance extends Annotatable {
     readonly MappedIndexes: SortedSet_1<IIndex>;
     readonly Name: string;
     readonly Table: Table;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetRowIndexValueFactory(): IRowIndexValueFactory;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetRowIndexValueFactory(factory: IRowIndexValueFactory): void;
     ToString(): string;
 }
@@ -7457,29 +5616,7 @@ export interface TableMapping$instance extends TableMappingBase_1$instance<Colum
     set InsertStoredProcedureMapping(value: IStoredProcedureMapping | undefined);
     get UpdateStoredProcedureMapping(): IStoredProcedureMapping | undefined;
     set UpdateStoredProcedureMapping(value: IStoredProcedureMapping | undefined);
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsSharedTablePrincipal(isSharedTablePrincipal: boolean): void;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7515,28 +5652,7 @@ export interface TableMappingBase_1$instance<TColumnMapping extends IColumnMappi
     IsSplitEntityTypePrincipal: Nullable_1<System_Internal.Boolean>;
     readonly Table: ITable | TableBase;
     readonly TypeBase: ITypeBase;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddColumnMapping(columnMapping: TColumnMapping): boolean;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsSharedTablePrincipal(isSharedTablePrincipal: boolean): void;
     ToString(): string;
 }
@@ -7592,34 +5708,7 @@ export interface Trigger$instance extends ConventionAnnotatable {
     readonly EntityType: EntityType;
     readonly IsInModel: boolean;
     readonly ModelName: string;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetConfigurationSource(): ConfigurationSource;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetRemovedFromModel(): void;
     ToString(): string;
     UpdateConfigurationSource(configurationSource: ConfigurationSource): void;
@@ -7659,8 +5748,8 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_Internal_IRuntimeTypeBase: never;
 
     readonly BaseBuilder: InternalTypeBaseBuilder;
-    get BaseType(): EntityType | undefined | TypeBase | undefined;
-    set BaseType(value: EntityType | undefined | TypeBase | undefined);
+    get BaseType(): ComplexType | undefined | TypeBase | undefined;
+    set BaseType(value: ComplexType | undefined | TypeBase | undefined);
     readonly ClrType: Type;
     get ConstructorBinding(): InstantiationBinding | undefined;
     set ConstructorBinding(value: InstantiationBinding | undefined);
@@ -7679,14 +5768,6 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     readonly ShadowValuesFactory: Func_2<IDictionary_2<System_Internal.String, unknown | undefined>, ISnapshot>;
     readonly StoreGeneratedValuesFactory: Func_1<ISnapshot>;
     readonly TemporaryValuesFactory: Func_2<IInternalEntry, ISnapshot>;
-    AddAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation;
-    AddAnnotation(name: string, value: unknown, fromDataAnnotation?: boolean): IConventionAnnotation;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IEnumerable_1<IConventionAnnotation>, fromDataAnnotation?: boolean): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
     AddComplexProperty(name: string, propertyType: Type, targetType: Type, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
     AddComplexProperty(memberInfo: MemberInfo, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
     AddComplexProperty(name: string, collection: boolean, configurationSource: ConfigurationSource): ComplexProperty | undefined;
@@ -7696,15 +5777,7 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     AddProperty(memberInfo: MemberInfo, configurationSource: ConfigurationSource): Property | undefined;
     AddProperty(name: string, configurationSource: ConfigurationSource): Property | undefined;
     AddProperty(name: string, propertyType: Type, memberInfo: MemberInfo, typeConfigurationSource: Nullable_1<ConfigurationSource>, configurationSource: ConfigurationSource): Property | undefined;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
     CalculateCounts(): PropertyCounts;
-    FindAnnotation(name: string): ConventionAnnotation | undefined;
-    FindAnnotation(name: string): IConventionAnnotation | undefined;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindComplexPropertiesInHierarchy(propertyName: string): IEnumerable_1<ComplexProperty>;
     FindComplexProperty(name: string): ComplexProperty | undefined;
     FindDeclaredComplexProperty(name: string): ComplexProperty | undefined;
@@ -7721,10 +5794,6 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     FindProperties(propertyNames: IReadOnlyList_1<System_Internal.String>): IReadOnlyList_1<Property> | undefined;
     FindPropertiesInHierarchy(propertyName: string): IEnumerable_1<Property>;
     FindProperty(name: string): Property | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<ConventionAnnotation>;
     GetBaseTypeConfigurationSource(): Nullable_1<ConfigurationSource>;
     GetChangeTrackingStrategy(): ChangeTrackingStrategy;
     GetChangeTrackingStrategyConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -7747,13 +5816,11 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     GetFlattenedValueGeneratingProperties(): IEnumerable_1<Property>;
     GetIgnoredMembers(): IEnumerable_1<System_Internal.String>;
     GetMembers(): IEnumerable_1<PropertyBase>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetOrCreateEmptyMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
     GetOrCreateMaterializer(source: IStructuralTypeMaterializerSource): Func_2<MaterializationContext, unknown>;
     GetProperties(): IEnumerable_1<Property>;
     GetPropertyAccessMode(): PropertyAccessMode;
     GetRootType(): TypeBase;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetRuntimeFields(): IReadOnlyDictionary_2<System_Internal.String, FieldInfo>;
     GetRuntimeProperties(): IReadOnlyDictionary_2<System_Internal.String, PropertyInfo>;
     GetServiceOnlyConstructorBindingConfigurationSource(): Nullable_1<ConfigurationSource>;
@@ -7761,16 +5828,11 @@ export interface TypeBase$instance extends ConventionAnnotatable {
     IsAssignableFrom(derivedType: TypeBase): boolean;
     IsIgnored(name: string): boolean;
     OnTypeMemberIgnored(name: string): string | undefined;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
     RemoveComplexProperty(name: string): ComplexProperty | undefined;
     RemoveComplexProperty(property: ComplexProperty): ComplexProperty | undefined;
     RemoveIgnored(name: string): string | undefined;
     RemoveProperty(name: string): Property | undefined;
     RemoveProperty(property: Property): Property | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, value: unknown, configurationSource: ConfigurationSource): ConventionAnnotation | undefined;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetBaseType(newBaseType: TypeBase, configurationSource: ConfigurationSource): TypeBase | undefined;
     SetChangeTrackingStrategy(changeTrackingStrategy: Nullable_1<ChangeTrackingStrategy>, configurationSource: ConfigurationSource): Nullable_1<ChangeTrackingStrategy>;
     SetConstructorBinding(constructorBinding: InstantiationBinding, configurationSource: ConfigurationSource): InstantiationBinding | undefined;
@@ -7817,28 +5879,7 @@ export interface UniqueConstraint$instance extends Annotatable {
     readonly MappedKeys: SortedSet_1<IKey>;
     readonly Name: string;
     readonly Table: Table;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
     GetRowKeyValueFactory(): IRowKeyValueFactory;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetRowKeyValueFactory(factory: IRowKeyValueFactory): void;
     ToString(): string;
 }
@@ -7888,33 +5929,8 @@ export interface View$instance extends TableBase$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IView: never;
 
     readonly ViewDefinitionSql: string | undefined;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
     FindColumn(property: IProperty): IColumnBase | undefined;
     FindColumn(name: string): ViewColumn | undefined;
-    FindColumn(name: string): IColumnBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRowInternalForeignKeys(entityType: IEntityType): IEnumerable_1<IForeignKey>;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    IsOptional(typeBase: ITypeBase): boolean;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7945,29 +5961,6 @@ export interface ViewColumn$instance extends ColumnBase_1$instance<ViewColumnMap
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IViewColumn: never;
 
     readonly View: View;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindColumnMapping(entityType: IReadOnlyEntityType): IColumnMappingBase | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }
 
@@ -7998,28 +5991,7 @@ export interface ViewColumnMapping$instance extends ColumnMappingBase$instance {
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IViewColumnMapping: never;
 
     readonly ViewMapping: IViewMapping;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
     GetTypeMapping(): RelationalTypeMapping;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     ToString(): string;
 }
 
@@ -8050,29 +6022,7 @@ export interface ViewMapping$instance extends TableMappingBase_1$instance<ViewCo
     readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Metadata_IViewMapping: never;
 
     readonly View: IView;
-    AddAnnotation(name: string, value: unknown): IAnnotation;
-    AddAnnotation(name: string, value: unknown): Annotation;
-    AddAnnotation(name: string, annotation: Annotation): Annotation;
-    AddAnnotations(annotations: IEnumerable_1<IAnnotation>): void;
-    AddAnnotations(annotations: IReadOnlyDictionary_2<System_Internal.String, unknown>): void;
-    AddRuntimeAnnotation(name: string, value: unknown): IAnnotation;
-    AddRuntimeAnnotation(name: string, value: unknown): Annotation;
-    AddRuntimeAnnotation(name: string, annotation: Annotation): Annotation;
-    AnnotationsToDebugString(indent?: int): string;
-    FindAnnotation(name: string): IAnnotation | undefined;
-    FindAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotation(name: string): IAnnotation | undefined;
-    FindRuntimeAnnotation(name: string): Annotation | undefined;
-    FindRuntimeAnnotationValue(name: string): unknown | undefined;
-    GetAnnotations(): IEnumerable_1<IAnnotation>;
-    GetOrAddRuntimeAnnotationValue<TValue, TArg>(name: string, valueFactory: Func_2<TArg, TValue>, factoryArgument: TArg): TValue;
-    GetRuntimeAnnotations(): IEnumerable_1<IAnnotation>;
-    RemoveAnnotation(name: string): IAnnotation | undefined;
-    RemoveAnnotation(name: string): Annotation | undefined;
-    SetAnnotation(name: string, value: unknown): void;
-    SetAnnotation(name: string, annotation: Annotation, oldAnnotation: Annotation): Annotation | undefined;
     SetIsSharedTablePrincipal(isSharedTablePrincipal: boolean): void;
-    ToDebugString(options?: MetadataDebugStringOptions, indent?: int): string;
     ToString(): string;
 }