@tsonic/efcore 10.0.3 → 10.0.8

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

@@ -23,22 +23,24 @@ import * as Microsoft_EntityFrameworkCore_Update_Internal from "../../Microsoft.
 import type { IUpdateEntry } from "../../Microsoft.EntityFrameworkCore.Update/internal/index.js";
 import type { IValueGeneratorSelector } from "../../Microsoft.EntityFrameworkCore.ValueGeneration/internal/index.js";
 import type { DbContext, DbLoggerCategory_ChangeTracking, DbLoggerCategory_Update, EntityState } from "../../Microsoft.EntityFrameworkCore/internal/index.js";
-import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { HashSet, ICollection as ICollection__System_Collections_Generic, IComparer as IComparer__System_Collections_Generic, IDictionary, IEnumerable as IEnumerable__System_Collections_Generic, IEqualityComparer as IEqualityComparer__System_Collections_Generic, IList as IList__System_Collections_Generic, IReadOnlyCollection, IReadOnlyList, List } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections.js";
-import type { ICollection, IComparer, IEnumerable, IEqualityComparer, IList } from "@tsonic/dotnet/System.Collections.js";
-import type { NotifyCollectionChangedEventArgs } from "@tsonic/dotnet/System.Collections.Specialized.js";
-import * as System_ComponentModel_Internal from "@tsonic/dotnet/System.ComponentModel.js";
-import type { BindingList, IBindingList, ICancelAddNew, IRaiseItemChangedEvents, ListSortDirection, PropertyChangedEventArgs, PropertyChangingEventArgs, PropertyDescriptor } from "@tsonic/dotnet/System.ComponentModel.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, Boolean as ClrBoolean, EventHandler, Func, IEquatable, Int32, Nullable, Object as ClrObject, String as ClrString, Tuple, Type, ValueTuple, ValueType, Void } from "@tsonic/dotnet/System.js";
-import type { Expression, LambdaExpression } from "@tsonic/dotnet/System.Linq.Expressions.js";
-import type { FieldInfo, MethodInfo } from "@tsonic/dotnet/System.Reflection.js";
-import type { CancellationToken } from "@tsonic/dotnet/System.Threading.js";
-import type { Task } from "@tsonic/dotnet/System.Threading.Tasks.js";
+import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { HashSet_1, ICollection_1, IComparer_1, IDictionary_2, IEnumerable_1, IEqualityComparer_1, IList_1, IReadOnlyCollection_1, IReadOnlyList_1, List_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { NotifyCollectionChangedEventArgs } from "@tsonic/dotnet/System.Collections.Specialized/internal/index.js";
+import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections/internal/index.js";
+import type { ICollection, IComparer, IEnumerable, IEqualityComparer, IList } from "@tsonic/dotnet/System.Collections/internal/index.js";
+import * as System_ComponentModel_Internal from "@tsonic/dotnet/System.ComponentModel/internal/index.js";
+import type { BindingList_1, IBindingList, ICancelAddNew, IRaiseItemChangedEvents, ListSortDirection, PropertyChangedEventArgs, PropertyChangingEventArgs, PropertyDescriptor } from "@tsonic/dotnet/System.ComponentModel/internal/index.js";
+import type { Expression, Expression_1, LambdaExpression } from "@tsonic/dotnet/System.Linq.Expressions/internal/index.js";
+import type { FieldInfo, MethodInfo } from "@tsonic/dotnet/System.Reflection/internal/index.js";
+import type { Task, Task_1 } from "@tsonic/dotnet/System.Threading.Tasks/internal/index.js";
+import type { CancellationToken } from "@tsonic/dotnet/System.Threading/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Action_2, Boolean as ClrBoolean, EventHandler_1, Func_1, Func_2, Func_3, IEquatable_1, Int32, Nullable_1, Object as ClrObject, String as ClrString, Tuple_2, Type, ValueTuple_2, ValueTuple_4, ValueType, Void } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface IChangeDetector$instance {
-    CaptureEvents(): ValueTuple<EventHandler<DetectChangesEventArgs>, EventHandler<DetectedChangesEventArgs>, EventHandler<DetectEntityChangesEventArgs>, EventHandler<DetectedEntityChangesEventArgs>>;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IChangeDetector: never;
+
+    CaptureEvents(): ValueTuple_4<EventHandler_1<DetectChangesEventArgs>, EventHandler_1<DetectedChangesEventArgs>, EventHandler_1<DetectEntityChangesEventArgs>, EventHandler_1<DetectedEntityChangesEventArgs>>;
     DetectChanges(entry: InternalComplexEntry): void;
     DetectChanges(entry: InternalEntityEntry): void;
     DetectChanges(stateManager: IStateManager): void;
@@ -48,13 +50,15 @@ export interface IChangeDetector$instance {
     PropertyChanged(entry: IInternalEntry, propertyBase: IPropertyBase, setModified: boolean): void;
     PropertyChanging(entry: IInternalEntry, propertyBase: IPropertyBase): void;
     ResetState(): void;
-    SetEvents(detectingAllChanges: EventHandler<DetectChangesEventArgs>, detectedAllChanges: EventHandler<DetectedChangesEventArgs>, detectingEntityChanges: EventHandler<DetectEntityChangesEventArgs>, detectedEntityChanges: EventHandler<DetectedEntityChangesEventArgs>): void;
+    SetEvents(detectingAllChanges: EventHandler_1<DetectChangesEventArgs>, detectedAllChanges: EventHandler_1<DetectedChangesEventArgs>, detectingEntityChanges: EventHandler_1<DetectEntityChangesEventArgs>, detectedEntityChanges: EventHandler_1<DetectedEntityChangesEventArgs>): void;
 }
 
 
 export type IChangeDetector = IChangeDetector$instance;
 
 export interface IChangeTrackerFactory$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IChangeTrackerFactory: never;
+
     Create(): ChangeTracker;
 }
 
@@ -62,15 +66,19 @@ export interface IChangeTrackerFactory$instance {
 export type IChangeTrackerFactory = IChangeTrackerFactory$instance;
 
 export interface IDependentsMap$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IDependentsMap: never;
+
     Add(entry: IUpdateEntry): void;
-    GetDependents(principalEntry: IUpdateEntry): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependents(keyValues: IReadOnlyList<unknown>): IEnumerable__System_Collections_Generic<IUpdateEntry>;
+    GetDependents(principalEntry: IUpdateEntry): IEnumerable_1<IUpdateEntry>;
+    GetDependents(keyValues: IReadOnlyList_1<unknown>): IEnumerable_1<IUpdateEntry>;
 }
 
 
 export type IDependentsMap = IDependentsMap$instance;
 
 export interface IEntityGraphAttacher$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IEntityGraphAttacher: never;
+
     AttachGraph(rootEntry: InternalEntityEntry, targetState: EntityState, storeGeneratedWithKeySetTargetState: EntityState, forceStateWhenUnknownKey: boolean): void;
     AttachGraphAsync(rootEntry: InternalEntityEntry, targetState: EntityState, storeGeneratedWithKeySetTargetState: EntityState, forceStateWhenUnknownKey: boolean, cancellationToken?: CancellationToken): Task;
 }
@@ -79,32 +87,36 @@ export interface IEntityGraphAttacher$instance {
 export type IEntityGraphAttacher = IEntityGraphAttacher$instance;
 
 export interface IIdentityMap$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap: never;
+
     readonly Key: IKey;
-    Add(keyValues: IReadOnlyList<unknown>, entry: InternalEntityEntry): void;
+    Add(keyValues: IReadOnlyList_1<unknown>, entry: InternalEntityEntry): void;
     AddOrUpdate(entry: InternalEntityEntry): void;
-    All(): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    All(): IEnumerable_1<InternalEntityEntry>;
     Clear(): void;
     GetDependentsMap(foreignKey: IForeignKey): IDependentsMap;
     TryGetEntry(entry: InternalEntityEntry): InternalEntityEntry | undefined;
     TryGetEntry(foreignKey: IForeignKey, dependentEntry: InternalEntityEntry): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
 }
 
 
 export type IIdentityMap = IIdentityMap$instance;
 
 export interface IIdentityMap_1$instance<TKey> extends IIdentityMap {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap_1: never;
+
     readonly Key: IKey;
-    Add(keyValues: IReadOnlyList<unknown>, entry: InternalEntityEntry): void;
+    Add(keyValues: IReadOnlyList_1<unknown>, entry: InternalEntityEntry): void;
     AddOrUpdate(entry: InternalEntityEntry): void;
-    All(): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    All(): IEnumerable_1<InternalEntityEntry>;
     Clear(): void;
     GetDependentsMap(foreignKey: IForeignKey): IDependentsMap;
     TryGetEntry(entry: InternalEntityEntry): InternalEntityEntry | undefined;
     TryGetEntry(foreignKey: IForeignKey, dependentEntry: InternalEntityEntry): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
     TryGetEntryTyped(keyValue: TKey): InternalEntityEntry | undefined;
 }
 
@@ -112,9 +124,11 @@ export interface IIdentityMap_1$instance<TKey> extends IIdentityMap {
 export type IIdentityMap_1<TKey> = IIdentityMap_1$instance<TKey>;
 
 export interface IInternalEntityEntryNotifier$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntityEntryNotifier: never;
+
     FixupResolved(entry: InternalEntityEntry, duplicateEntry: InternalEntityEntry): void;
-    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, keys: IEnumerable__System_Collections_Generic<IKey>, foreignKeys: IEnumerable__System_Collections_Generic<IForeignKey>, oldValue: unknown, newValue: unknown): void;
-    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable__System_Collections_Generic<unknown>, removed: IEnumerable__System_Collections_Generic<unknown>): void;
+    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, keys: IEnumerable_1<IKey>, foreignKeys: IEnumerable_1<IForeignKey>, oldValue: unknown, newValue: unknown): void;
+    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable_1<unknown>, removed: IEnumerable_1<unknown>): void;
     NavigationReferenceChanged(entry: InternalEntityEntry, navigation: INavigation, oldValue: unknown, newValue: unknown): void;
     PropertyChanged(entry: IInternalEntry, property: IPropertyBase, setModified: boolean): void;
     PropertyChanging(entry: IInternalEntry, property: IPropertyBase): void;
@@ -127,6 +141,8 @@ export interface IInternalEntityEntryNotifier$instance {
 export type IInternalEntityEntryNotifier = IInternalEntityEntryNotifier$instance;
 
 export interface IInternalEntry$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntry: never;
+
     get Item(): unknown | undefined;
     set Item(value: unknown | undefined);
     readonly EntityState: EntityState;
@@ -139,12 +155,12 @@ export interface IInternalEntry$instance {
     readonly StateManager: IStateManager;
     AcceptChanges(): void;
     FlaggedAsStoreGenerated(propertyIndex: int): boolean;
-    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList<InternalComplexEntry | undefined>;
+    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList_1<InternalComplexEntry | undefined>;
     GetComplexCollectionEntry(property: IComplexProperty, ordinal: int): InternalComplexEntry;
     GetCurrentValue(propertyBase: IPropertyBase): unknown | undefined;
     GetCurrentValue<TProperty>(propertyBase: IPropertyBase): TProperty;
-    GetFlattenedComplexEntries(): IEnumerable__System_Collections_Generic<InternalComplexEntry>;
-    GetOrdinals(): IReadOnlyList<System_Internal.Int32>;
+    GetFlattenedComplexEntries(): IEnumerable_1<InternalComplexEntry>;
+    GetOrdinals(): IReadOnlyList_1<System_Internal.Int32>;
     GetOriginalValue<TProperty>(property: IProperty): TProperty;
     HandleConceptualNulls(sensitiveLoggingEnabled: boolean, force: boolean, isCascadeDelete: boolean): void;
     HasExplicitValue(property: IProperty): boolean;
@@ -156,7 +172,7 @@ export interface IInternalEntry$instance {
     PrepareToSave(): IInternalEntry;
     ReadOriginalValue<T>(property: IProperty, originalValueIndex: int): T;
     ReadStoreGeneratedValue<T>(storeGeneratedIndex: int): T;
-    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>): void;
+    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>): void;
     SetOriginalValue(propertyBase: IPropertyBase, value: unknown, index?: int): void;
     SetProperty(propertyBase: IPropertyBase, value: unknown, isMaterialization: boolean, setModified?: boolean, isCascadeDelete?: boolean): void;
     SetPropertyModified(property: IComplexProperty, isModified?: boolean, recurse?: boolean): void;
@@ -168,6 +184,8 @@ export interface IInternalEntry$instance {
 export type IInternalEntry = IInternalEntry$instance;
 
 export interface IInternalEntrySubscriber$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntrySubscriber: never;
+
     SnapshotAndSubscribe(entry: InternalComplexEntry): boolean;
     SnapshotAndSubscribe(entry: InternalEntityEntry): boolean;
     SubscribeCollectionChanged(entry: InternalEntityEntry, navigation: INavigationBase): void;
@@ -180,15 +198,19 @@ export interface IInternalEntrySubscriber$instance {
 export type IInternalEntrySubscriber = IInternalEntrySubscriber$instance;
 
 export interface IKeyPropagator$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IKeyPropagator: never;
+
     PropagateValue(entry: InternalEntityEntry, property: IProperty): InternalEntityEntry | undefined;
-    PropagateValueAsync(entry: InternalEntityEntry, property: IProperty, cancellationToken?: CancellationToken): Task<InternalEntityEntry | undefined>;
+    PropagateValueAsync(entry: InternalEntityEntry, property: IProperty, cancellationToken?: CancellationToken): Task_1<InternalEntityEntry | undefined>;
 }
 
 
 export type IKeyPropagator = IKeyPropagator$instance;
 
 export interface ILocalViewListener$instance {
-    RegisterView(viewAction: Action<InternalEntityEntry, EntityState>): void;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ILocalViewListener: never;
+
+    RegisterView(viewAction: Action_2<InternalEntityEntry, EntityState>): void;
     StateChanged(entry: InternalEntityEntry, oldState: EntityState, fromQuery: boolean): void;
     StateChanging(entry: InternalEntityEntry, newState: EntityState): void;
 }
@@ -197,11 +219,13 @@ export interface ILocalViewListener$instance {
 export type ILocalViewListener = ILocalViewListener$instance;
 
 export interface INavigationFixer$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_INavigationFixer: never;
+
     BeginDelayedFixup(): boolean;
     CompleteDelayedFixup(): void;
     FixupResolved(entry: InternalEntityEntry, duplicateEntry: InternalEntityEntry): void;
-    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, containingPrincipalKeys: IEnumerable__System_Collections_Generic<IKey>, containingForeignKeys: IEnumerable__System_Collections_Generic<IForeignKey>, oldValue: unknown, newValue: unknown): void;
-    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable__System_Collections_Generic<unknown>, removed: IEnumerable__System_Collections_Generic<unknown>): void;
+    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, containingPrincipalKeys: IEnumerable_1<IKey>, containingForeignKeys: IEnumerable_1<IForeignKey>, oldValue: unknown, newValue: unknown): void;
+    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable_1<unknown>, removed: IEnumerable_1<unknown>): void;
     NavigationReferenceChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, oldValue: unknown, newValue: unknown): void;
     StateChanged(entry: InternalEntityEntry, oldState: EntityState, fromQuery: boolean): void;
     StateChanging(entry: InternalEntityEntry, newState: EntityState): void;
@@ -212,6 +236,8 @@ export interface INavigationFixer$instance {
 export type INavigationFixer = INavigationFixer$instance;
 
 export interface ISnapshot$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     readonly IsEmpty: boolean;
     GetValue<T>(index: int): T;
@@ -221,11 +247,13 @@ export interface ISnapshot$instance {
 export type ISnapshot = ISnapshot$instance;
 
 export interface IStateManager$instance extends IResettableService {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IStateManager: never;
+
     readonly Dependencies: StateManagerDependencies;
     DeleteOrphansTiming: CascadeTiming;
     CascadeDeleteTiming: CascadeTiming;
     readonly SavingChanges: boolean;
-    readonly Entries: IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    readonly Entries: IEnumerable_1<InternalEntityEntry>;
     readonly Count: int;
     ChangedCount: int;
     readonly InternalEntityEntryNotifier: IInternalEntityEntryNotifier;
@@ -236,35 +264,35 @@ export interface IStateManager$instance extends IResettableService {
     readonly SensitiveLoggingEnabled: boolean;
     readonly UpdateLogger: IDiagnosticsLogger_1<DbLoggerCategory_Update>;
     BeginAttachGraph(): void;
-    CaptureEvents(): ValueTuple<EventHandler<EntityTrackingEventArgs>, EventHandler<EntityTrackedEventArgs>, EventHandler<EntityStateChangingEventArgs>, EventHandler<EntityStateChangedEventArgs>>;
-    CascadeDelete(entry: InternalEntityEntry, force: boolean, foreignKeys?: IEnumerable__System_Collections_Generic<IForeignKey>): void;
+    CaptureEvents(): ValueTuple_4<EventHandler_1<EntityTrackingEventArgs>, EventHandler_1<EntityTrackedEventArgs>, EventHandler_1<EntityStateChangingEventArgs>, EventHandler_1<EntityStateChangedEventArgs>>;
+    CascadeDelete(entry: InternalEntityEntry, force: boolean, foreignKeys?: IEnumerable_1<IForeignKey>): void;
     ChangingState(entry: InternalEntityEntry, newState: EntityState): void;
     CreateEntityFinder(entityType: IEntityType): IEntityFinder;
-    CreateEntry(values: IDictionary<System_Internal.String, unknown>, entityType: IEntityType): InternalEntityEntry;
+    CreateEntry(values: IDictionary_2<System_Internal.String, unknown>, entityType: IEntityType): InternalEntityEntry;
     FindPrincipal(dependentEntry: InternalEntityEntry, foreignKey: IForeignKey): InternalEntityEntry | undefined;
     GetCountForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnSharedIdentity?: boolean): int;
-    GetDependents(keyValues: IReadOnlyList<unknown>, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependentsFromNavigation(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry> | undefined;
-    GetEntries(key: IKey): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
-    GetEntriesForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnSharedIdentity?: boolean): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
-    GetEntriesToSave(cascadeChanges: boolean): IList__System_Collections_Generic<IUpdateEntry>;
-    GetNonDeletedEntities<TEntity>(): IEnumerable__System_Collections_Generic<TEntity>;
+    GetDependents(keyValues: IReadOnlyList_1<unknown>, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry>;
+    GetDependentsFromNavigation(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry> | undefined;
+    GetEntries(key: IKey): IEnumerable_1<InternalEntityEntry>;
+    GetEntriesForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnSharedIdentity?: boolean): IEnumerable_1<InternalEntityEntry>;
+    GetEntriesToSave(cascadeChanges: boolean): IList_1<IUpdateEntry>;
+    GetNonDeletedEntities<TEntity>(): IEnumerable_1<TEntity>;
     GetOrCreateEntry(entity: unknown, entityType: IEntityType): InternalEntityEntry;
     GetOrCreateEntry(entity: unknown): InternalEntityEntry;
-    GetRecordedReferrers(referencedEntity: unknown, clear: boolean): IEnumerable__System_Collections_Generic<Tuple<INavigationBase, InternalEntityEntry>>;
+    GetRecordedReferrers(referencedEntity: unknown, clear: boolean): IEnumerable_1<Tuple_2<INavigationBase, InternalEntityEntry>>;
     OnTracked(internalEntityEntry: InternalEntityEntry, fromQuery: boolean): void;
     OnTracking(internalEntityEntry: InternalEntityEntry, state: EntityState, fromQuery: boolean): void;
     RecordReferencedUntrackedEntity(referencedEntity: unknown, navigation: INavigationBase, referencedFromEntry: InternalEntityEntry): void;
     ResetStateAsync(cancellationToken?: CancellationToken): Task;
     ResolveToExistingEntry(newEntry: InternalEntityEntry, navigation: INavigationBase, referencedFromEntry: InternalEntityEntry): boolean;
     SaveChanges(acceptAllChangesOnSuccess: boolean): int;
-    SaveChangesAsync(acceptAllChangesOnSuccess: boolean, cancellationToken?: CancellationToken): Task<System_Internal.Int32>;
-    SetEvents(tracking: EventHandler<EntityTrackingEventArgs>, tracked: EventHandler<EntityTrackedEventArgs>, stateChanging: EventHandler<EntityStateChangingEventArgs>, stateChanged: EventHandler<EntityStateChangedEventArgs>): void;
+    SaveChangesAsync(acceptAllChangesOnSuccess: boolean, cancellationToken?: CancellationToken): Task_1<System_Internal.Int32>;
+    SetEvents(tracking: EventHandler_1<EntityTrackingEventArgs>, tracked: EventHandler_1<EntityTrackedEventArgs>, stateChanging: EventHandler_1<EntityStateChangingEventArgs>, stateChanged: EventHandler_1<EntityStateChangedEventArgs>): void;
     StartTracking(entry: InternalComplexEntry): InternalComplexEntry;
     StartTracking(entry: InternalEntityEntry): InternalEntityEntry;
     StartTrackingFromQuery(baseEntityType: IEntityType, entity: unknown, snapshot: ISnapshot): InternalEntityEntry;
     StopTracking(entry: InternalComplexEntry, oldState: EntityState): void;
-    TryGetEntry(key: IKey, keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(key: IKey, keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
     TryGetEntry(key: IKey, keyValues: unknown[], throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
     TryGetEntry(entity: unknown, type: IEntityType, throwOnTypeMismatch?: boolean): InternalEntityEntry | undefined;
     TryGetEntry(entity: unknown, throwOnNonUniqueness?: boolean): InternalEntityEntry | undefined;
@@ -283,16 +311,22 @@ export interface IStateManager$instance extends Microsoft_EntityFrameworkCore_In
 export type IStateManager = IStateManager$instance;
 
 export interface IValueGenerationManager$instance {
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IValueGenerationManager: never;
+
     Generate(entry: InternalEntityEntry, includePrimaryKey?: boolean): boolean;
-    GenerateAsync(entry: InternalEntityEntry, includePrimaryKey?: boolean, cancellationToken?: CancellationToken): Task<System_Internal.Boolean>;
+    GenerateAsync(entry: InternalEntityEntry, includePrimaryKey?: boolean, cancellationToken?: CancellationToken): Task_1<System_Internal.Boolean>;
     Propagate(entry: InternalEntityEntry): InternalEntityEntry | undefined;
-    PropagateAsync(entry: InternalEntityEntry, cancellationToken: CancellationToken): Task<InternalEntityEntry | undefined>;
+    PropagateAsync(entry: InternalEntityEntry, cancellationToken: CancellationToken): Task_1<InternalEntityEntry | undefined>;
 }
 
 
 export type IValueGenerationManager = IValueGenerationManager$instance;
 
-export interface MultiSnapshot$instance {
+export interface MultiSnapshot$instance extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_MultiSnapshot: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -307,12 +341,12 @@ export interface __MultiSnapshot$views {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface MultiSnapshot$instance extends ISnapshot$instance {}
-
 export type MultiSnapshot = MultiSnapshot$instance & __MultiSnapshot$views;
 
 
 export interface ArrayPropertyValues$instance extends PropertyValues {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ArrayPropertyValues: never;
+
     Clone(): PropertyValues;
     get_Item(propertyName: string): unknown | undefined;
     get_Item(property: IProperty): unknown | undefined;
@@ -324,7 +358,7 @@ export interface ArrayPropertyValues$instance extends PropertyValues {
     set_Item(complexProperty: IComplexProperty, value: IList | undefined): void;
     SetValues(obj: unknown): void;
     SetValues(propertyValues: PropertyValues): void;
-    SetValues<TProperty>(values: IDictionary<System_Internal.String, TProperty>): void;
+    SetValues<TProperty>(values: IDictionary_2<System_Internal.String, TProperty>): void;
     ToObject(): unknown;
 }
 
@@ -337,7 +371,11 @@ export const ArrayPropertyValues: {
 export type ArrayPropertyValues = ArrayPropertyValues$instance;
 
 export interface ChangeDetector$instance {
-    CaptureEvents(): ValueTuple<EventHandler<DetectChangesEventArgs>, EventHandler<DetectedChangesEventArgs>, EventHandler<DetectEntityChangesEventArgs>, EventHandler<DetectedEntityChangesEventArgs>>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ChangeDetector: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IChangeDetector: never;
+
+    CaptureEvents(): ValueTuple_4<EventHandler_1<DetectChangesEventArgs>, EventHandler_1<DetectedChangesEventArgs>, EventHandler_1<DetectEntityChangesEventArgs>, EventHandler_1<DetectedEntityChangesEventArgs>>;
     DetectChanges(stateManager: IStateManager): void;
     DetectChanges(entry: InternalEntityEntry): void;
     DetectChanges(entry: InternalComplexEntry): void;
@@ -351,7 +389,7 @@ export interface ChangeDetector$instance {
     PropertyChanged(entry: IInternalEntry, propertyBase: IPropertyBase, setModified: boolean): void;
     PropertyChanging(entry: IInternalEntry, propertyBase: IPropertyBase): void;
     ResetState(): void;
-    SetEvents(detectingAllChanges: EventHandler<DetectChangesEventArgs>, detectedAllChanges: EventHandler<DetectedChangesEventArgs>, detectingEntityChanges: EventHandler<DetectEntityChangesEventArgs>, detectedEntityChanges: EventHandler<DetectedEntityChangesEventArgs>): void;
+    SetEvents(detectingAllChanges: EventHandler_1<DetectChangesEventArgs>, detectedAllChanges: EventHandler_1<DetectedChangesEventArgs>, detectingEntityChanges: EventHandler_1<DetectEntityChangesEventArgs>, detectedEntityChanges: EventHandler_1<DetectedEntityChangesEventArgs>): void;
 }
 
 
@@ -367,7 +405,11 @@ export interface __ChangeDetector$views {
 export type ChangeDetector = ChangeDetector$instance & __ChangeDetector$views;
 
 
-export interface ChangeTrackerFactory$instance {
+export interface ChangeTrackerFactory$instance extends IChangeTrackerFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ChangeTrackerFactory: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IChangeTrackerFactory: never;
+
     Create(): ChangeTracker;
 }
 
@@ -381,43 +423,53 @@ export interface __ChangeTrackerFactory$views {
     As_IChangeTrackerFactory(): IChangeTrackerFactory$instance;
 }
 
-export interface ChangeTrackerFactory$instance extends IChangeTrackerFactory$instance {}
-
 export type ChangeTrackerFactory = ChangeTrackerFactory$instance & __ChangeTrackerFactory$views;
 
 
 export interface CompositeDependentKeyValueFactory$instance extends CompositeValueFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CompositeDependentKeyValueFactory: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
     CreateDependentEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown | undefined;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
-    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
+    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: unknown): boolean;
 }
 
 
 export const CompositeDependentKeyValueFactory: {
-    new(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<IReadOnlyList<unknown>>): CompositeDependentKeyValueFactory;
+    new(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<IReadOnlyList_1<unknown>>): CompositeDependentKeyValueFactory;
 };
 
 
 export interface __CompositeDependentKeyValueFactory$views {
     As_IDependentKeyValueFactory(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory$instance;
-    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList<unknown>>;
+    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList_1<unknown>>;
 }
 
 export type CompositeDependentKeyValueFactory = CompositeDependentKeyValueFactory$instance & __CompositeDependentKeyValueFactory$views;
 
 
 export interface CompositePrincipalKeyValueFactory$instance extends CompositeValueFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CompositePrincipalKeyValueFactory: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IPrincipalKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IPrincipalKeyValueFactory_1: never;
+
     CreateEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     CreateFromBuffer(valueBuffer: ValueBuffer): unknown | undefined;
-    CreateFromCurrentValues(entry: IUpdateEntry): IReadOnlyList<unknown | undefined>;
-    CreateFromKeyValues(keyValues: IReadOnlyList<unknown>): unknown | undefined;
-    CreateFromOriginalValues(entry: IUpdateEntry): IReadOnlyList<unknown | undefined>;
-    CreateFromRelationshipSnapshot(entry: IUpdateEntry): IReadOnlyList<unknown | undefined>;
+    CreateFromCurrentValues(entry: IUpdateEntry): IReadOnlyList_1<unknown | undefined>;
+    CreateFromKeyValues(keyValues: IReadOnlyList_1<unknown>): unknown | undefined;
+    CreateFromOriginalValues(entry: IUpdateEntry): IReadOnlyList_1<unknown | undefined>;
+    CreateFromRelationshipSnapshot(entry: IUpdateEntry): IReadOnlyList_1<unknown | undefined>;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     FindNullPropertyInCurrentValues(entry: IUpdateEntry): IProperty;
-    FindNullPropertyInKeyValues(keyValues: IReadOnlyList<unknown>): IProperty;
-    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
+    FindNullPropertyInKeyValues(keyValues: IReadOnlyList_1<unknown>): IProperty;
+    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: unknown): boolean;
 }
 
@@ -429,43 +481,54 @@ export const CompositePrincipalKeyValueFactory: {
 
 export interface __CompositePrincipalKeyValueFactory$views {
     As_IDependentKeyValueFactory(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory$instance;
-    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList<unknown>>;
+    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList_1<unknown>>;
     As_IPrincipalKeyValueFactory(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IPrincipalKeyValueFactory$instance;
-    As_IPrincipalKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IPrincipalKeyValueFactory_1$instance<IReadOnlyList<unknown>>;
+    As_IPrincipalKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IPrincipalKeyValueFactory_1$instance<IReadOnlyList_1<unknown>>;
 }
 
 export type CompositePrincipalKeyValueFactory = CompositePrincipalKeyValueFactory$instance & __CompositePrincipalKeyValueFactory$views;
 
 
 export interface CompositeValueFactory$instance {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<IReadOnlyList<unknown | undefined>>;
-    readonly Properties: IReadOnlyList<IProperty>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CompositeValueFactory: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<IReadOnlyList_1<unknown | undefined>>;
+    readonly Properties: IReadOnlyList_1<IProperty>;
     CreateDependentEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown | undefined;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
-    TryCreateFromBuffer(valueBuffer: ValueBuffer, key: IReadOnlyList<unknown>): boolean;
-    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
-    TryCreateFromEntry(entry: IUpdateEntry, getValue: Func<IUpdateEntry, IProperty, unknown>, key: IReadOnlyList<unknown>): boolean;
-    TryCreateFromOriginalValues(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
-    TryCreateFromPreStoreGeneratedCurrentValues(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
-    TryCreateFromRelationshipSnapshot(entry: IUpdateEntry, key: IReadOnlyList<unknown>): boolean;
+    TryCreateFromBuffer(valueBuffer: ValueBuffer, key: IReadOnlyList_1<unknown>): boolean;
+    TryCreateFromCurrentValues(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
+    TryCreateFromEntry(entry: IUpdateEntry, getValue: Func_3<IUpdateEntry, IProperty, unknown>, key: IReadOnlyList_1<unknown>): boolean;
+    TryCreateFromOriginalValues(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
+    TryCreateFromPreStoreGeneratedCurrentValues(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
+    TryCreateFromRelationshipSnapshot(entry: IUpdateEntry, key: IReadOnlyList_1<unknown>): boolean;
 }
 
 
 export const CompositeValueFactory: {
-    new(properties: IReadOnlyList<IProperty>): CompositeValueFactory;
-    CreateEqualityComparer(properties: IReadOnlyList<IProperty>): IEqualityComparer__System_Collections_Generic<IReadOnlyList<unknown | undefined>>;
+    new(properties: IReadOnlyList_1<IProperty>): CompositeValueFactory;
+    CreateEqualityComparer(properties: IReadOnlyList_1<IProperty>): IEqualityComparer_1<IReadOnlyList_1<unknown | undefined>>;
 };
 
 
 export interface __CompositeValueFactory$views {
     As_IDependentKeyValueFactory(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory$instance;
-    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList<unknown>>;
+    As_IDependentKeyValueFactory_1(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IDependentKeyValueFactory_1$instance<IReadOnlyList_1<unknown>>;
 }
 
 export type CompositeValueFactory = CompositeValueFactory$instance & __CompositeValueFactory$views;
 
 
-export interface ConvertingValueComparer_2$instance<TTo, TFrom> extends ValueComparer_1<TTo> {
+export interface ConvertingValueComparer_2$instance<TTo, TFrom> extends ValueComparer_1<TTo>, Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer>, System_Collections_Generic_Internal.IEqualityComparer_1<unknown>, System_Collections_Generic_Internal.IEqualityComparer_1<TTo> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ConvertingValueComparer_2: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+    readonly __tsonic_iface_System_Collections_IEqualityComparer: never;
+
 }
 
 
@@ -478,12 +541,12 @@ export interface __ConvertingValueComparer_2$views<TTo, TFrom> {
     As_IInfrastructure_1(): Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer>;
 }
 
-export interface ConvertingValueComparer_2$instance<TTo, TFrom> extends Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer> {}
-
 export type ConvertingValueComparer_2<TTo, TFrom> = ConvertingValueComparer_2$instance<TTo, TFrom> & __ConvertingValueComparer_2$views<TTo, TFrom>;
 
 
 export interface CurrentPropertyValues$instance extends EntryPropertyValues {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CurrentPropertyValues: never;
+
     GetComplexCollectionEntry(entry: InternalEntryBase, complexProperty: IComplexProperty, i: int): InternalComplexEntry;
     GetValue<TValue>(propertyName: string): TValue;
     GetValue<TValue>(property: IProperty): TValue;
@@ -500,6 +563,10 @@ export const CurrentPropertyValues: {
 export type CurrentPropertyValues = CurrentPropertyValues$instance;
 
 export interface CurrentProviderValueComparer_2$instance<TModel, TProvider> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CurrentProviderValueComparer_2: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+
     Compare(x: IUpdateEntry, y: IUpdateEntry): int;
 }
 
@@ -512,7 +579,9 @@ export const CurrentProviderValueComparer_2: {
 export type CurrentProviderValueComparer_2<TModel, TProvider> = CurrentProviderValueComparer_2$instance<TModel, TProvider>;
 
 export interface CurrentValueComparerFactory$instance {
-    Create(property: IPropertyBase): IComparer__System_Collections_Generic<IUpdateEntry>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_CurrentValueComparerFactory: never;
+
+    Create(property: IPropertyBase): IComparer_1<IUpdateEntry>;
     GetComparerType(propertyBase: IPropertyBase): Type;
 }
 
@@ -525,7 +594,9 @@ export const CurrentValueComparerFactory: {
 export type CurrentValueComparerFactory = CurrentValueComparerFactory$instance;
 
 export interface DependentKeyValueFactory_1$instance<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_DependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreateDependentEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown | undefined;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: TKey): boolean;
@@ -540,7 +611,9 @@ export const DependentKeyValueFactory_1: (abstract new<TKey>(foreignKey: IForeig
 export type DependentKeyValueFactory_1<TKey> = DependentKeyValueFactory_1$instance<TKey>;
 
 export interface DependentKeyValueFactoryFactory$instance {
-    CreateComposite(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<IReadOnlyList<unknown>>): IDependentKeyValueFactory_1<IReadOnlyList<unknown | undefined>>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_DependentKeyValueFactoryFactory: never;
+
+    CreateComposite(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<IReadOnlyList_1<unknown>>): IDependentKeyValueFactory_1<IReadOnlyList_1<unknown | undefined>>;
     CreateSimpleNonNullable<TKey extends unknown>(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<TKey>): IDependentKeyValueFactory_1<TKey>;
     CreateSimpleNullable<TKey, TNonNullableKey extends unknown>(foreignKey: IForeignKey, principalKeyValueFactory: IPrincipalKeyValueFactory_1<TKey>): IDependentKeyValueFactory_1<TKey>;
 }
@@ -554,10 +627,14 @@ export const DependentKeyValueFactoryFactory: {
 export type DependentKeyValueFactoryFactory = DependentKeyValueFactoryFactory$instance;
 
 export interface DependentsMap_1$instance<TKey> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_DependentsMap_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IDependentsMap: never;
+
     Add(entry: IUpdateEntry): void;
-    GetDependents(principalEntry: IUpdateEntry): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependents(keyValues: IReadOnlyList<unknown>): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependentsUsingRelationshipSnapshot(principalEntry: IUpdateEntry): IEnumerable__System_Collections_Generic<IUpdateEntry>;
+    GetDependents(principalEntry: IUpdateEntry): IEnumerable_1<IUpdateEntry>;
+    GetDependents(keyValues: IReadOnlyList_1<unknown>): IEnumerable_1<IUpdateEntry>;
+    GetDependentsUsingRelationshipSnapshot(principalEntry: IUpdateEntry): IEnumerable_1<IUpdateEntry>;
     Remove(entry: IUpdateEntry): void;
     Update(entry: IUpdateEntry): void;
 }
@@ -576,6 +653,8 @@ export type DependentsMap_1<TKey> = DependentsMap_1$instance<TKey> & __Dependent
 
 
 export interface EmptyShadowValuesFactoryFactory$instance extends SnapshotFactoryFactory {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EmptyShadowValuesFactoryFactory: never;
+
     readonly UseEntityVariable: boolean;
     CreateReadShadowValueExpression(parameter: Expression, property: IPropertyBase): Expression;
     CreateReadValueExpression(parameter: Expression, property: IPropertyBase): Expression;
@@ -593,9 +672,13 @@ export const EmptyShadowValuesFactoryFactory: {
 
 export type EmptyShadowValuesFactoryFactory = EmptyShadowValuesFactoryFactory$instance;
 
-export interface EntityEntryGraphIterator$instance {
-    TraverseGraph<TState>(node: EntityEntryGraphNode_1<TState>, handleNode: Func<EntityEntryGraphNode_1<TState>, System_Internal.Boolean>): void;
-    TraverseGraphAsync<TState>(node: EntityEntryGraphNode_1<TState>, handleNode: Func<EntityEntryGraphNode_1<TState>, CancellationToken, Task<System_Internal.Boolean>>, cancellationToken?: CancellationToken): Task;
+export interface EntityEntryGraphIterator$instance extends Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IEntityEntryGraphIterator$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntityEntryGraphIterator: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IEntityEntryGraphIterator: never;
+
+    TraverseGraph<TState>(node: EntityEntryGraphNode_1<TState>, handleNode: Func_2<EntityEntryGraphNode_1<TState>, System_Internal.Boolean>): void;
+    TraverseGraphAsync<TState>(node: EntityEntryGraphNode_1<TState>, handleNode: Func_3<EntityEntryGraphNode_1<TState>, CancellationToken, Task_1<System_Internal.Boolean>>, cancellationToken?: CancellationToken): Task;
 }
 
 
@@ -608,12 +691,14 @@ export interface __EntityEntryGraphIterator$views {
     As_IEntityEntryGraphIterator(): Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IEntityEntryGraphIterator$instance;
 }
 
-export interface EntityEntryGraphIterator$instance extends Microsoft_EntityFrameworkCore_ChangeTracking_Internal.IEntityEntryGraphIterator$instance {}
-
 export type EntityEntryGraphIterator = EntityEntryGraphIterator$instance & __EntityEntryGraphIterator$views;
 
 
-export interface EntityGraphAttacher$instance {
+export interface EntityGraphAttacher$instance extends IEntityGraphAttacher$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntityGraphAttacher: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IEntityGraphAttacher: never;
+
     AttachGraph(rootEntry: InternalEntityEntry, targetState: EntityState, storeGeneratedWithKeySetTargetState: EntityState, forceStateWhenUnknownKey: boolean): void;
     AttachGraphAsync(rootEntry: InternalEntityEntry, targetState: EntityState, storeGeneratedWithKeySetTargetState: EntityState, forceStateWhenUnknownKey: boolean, cancellationToken?: CancellationToken): Task;
 }
@@ -628,18 +713,18 @@ export interface __EntityGraphAttacher$views {
     As_IEntityGraphAttacher(): IEntityGraphAttacher$instance;
 }
 
-export interface EntityGraphAttacher$instance extends IEntityGraphAttacher$instance {}
-
 export type EntityGraphAttacher = EntityGraphAttacher$instance & __EntityGraphAttacher$views;
 
 
 export interface EntityReferenceMap$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntityReferenceMap: never;
+
     Clear(): void;
     GetCountForState(added: boolean, modified: boolean, deleted: boolean, unchanged: boolean, countDeletedSharedIdentity: boolean): int;
-    GetEntriesForState(added: boolean, modified: boolean, deleted: boolean, unchanged: boolean, returnDeletedSharedIdentity: boolean): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
-    GetNonDeletedEntities<TEntity>(): IEnumerable__System_Collections_Generic<TEntity>;
+    GetEntriesForState(added: boolean, modified: boolean, deleted: boolean, unchanged: boolean, returnDeletedSharedIdentity: boolean): IEnumerable_1<InternalEntityEntry>;
+    GetNonDeletedEntities<TEntity>(): IEnumerable_1<TEntity>;
     TryGet(entity: unknown, entityType: IEntityType, entry: InternalEntityEntry, throwOnNonUniqueness: boolean): boolean;
-    Update(entry: InternalEntityEntry, state: EntityState, oldState: Nullable<EntityState>): void;
+    Update(entry: InternalEntityEntry, state: EntityState, oldState: Nullable_1<EntityState>): void;
 }
 
 
@@ -651,6 +736,11 @@ export const EntityReferenceMap: {
 export type EntityReferenceMap = EntityReferenceMap$instance;
 
 export interface EntryCurrentProviderValueComparer$instance extends EntryCurrentValueComparer {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntryCurrentProviderValueComparer: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+
     GetPropertyValue(entry: IUpdateEntry): unknown | undefined;
 }
 
@@ -663,6 +753,11 @@ export const EntryCurrentProviderValueComparer: {
 export type EntryCurrentProviderValueComparer = EntryCurrentProviderValueComparer$instance;
 
 export interface EntryCurrentValueComparer$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntryCurrentValueComparer: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+
     Compare(x: IUpdateEntry, y: IUpdateEntry): int;
     ComparePropertyValues(x: unknown, y: unknown): int;
     Equals(x: IUpdateEntry, y: IUpdateEntry): boolean;
@@ -680,6 +775,8 @@ export const EntryCurrentValueComparer: {
 export type EntryCurrentValueComparer = EntryCurrentValueComparer$instance;
 
 export interface EntryPropertyValues$instance extends PropertyValues {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_EntryPropertyValues: never;
+
     Clone(): PropertyValues;
     get_Item(propertyName: string): unknown | undefined;
     get_Item(property: IProperty): unknown | undefined;
@@ -692,8 +789,8 @@ export interface EntryPropertyValues$instance extends PropertyValues {
     SetValueInternal(entry: IInternalEntry, property: IPropertyBase, value: unknown): void;
     SetValues(obj: unknown): void;
     SetValues(propertyValues: PropertyValues): void;
-    SetValues<TProperty>(values: IDictionary<System_Internal.String, TProperty>): void;
-    SetValues<TProperty>(values: IDictionary<System_Internal.String, TProperty>): void;
+    SetValues<TProperty>(values: IDictionary_2<System_Internal.String, TProperty>): void;
+    SetValues<TProperty>(values: IDictionary_2<System_Internal.String, TProperty>): void;
     ToObject(): unknown;
 }
 
@@ -705,13 +802,18 @@ export const EntryPropertyValues: (abstract new(internalEntry: InternalEntryBase
 export type EntryPropertyValues = EntryPropertyValues$instance;
 
 export interface IdentityMap_1$instance<TKey> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IdentityMap_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap_1: never;
+
     readonly Key: IKey;
     readonly PrincipalKeyValueFactory: IPrincipalKeyValueFactory_1<TKey>;
     Add(entry: InternalEntityEntry): void;
-    Add(keyValues: IReadOnlyList<unknown>, entry: InternalEntityEntry): void;
+    Add(keyValues: IReadOnlyList_1<unknown>, entry: InternalEntityEntry): void;
     Add(key: TKey, entry: InternalEntityEntry): void;
     AddOrUpdate(entry: InternalEntityEntry): void;
-    All(): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    All(): IEnumerable_1<InternalEntityEntry>;
     Clear(): void;
     FindDependentsMap(foreignKey: IForeignKey): IDependentsMap | undefined;
     GetDependentsMap(foreignKey: IForeignKey): IDependentsMap;
@@ -719,8 +821,8 @@ export interface IdentityMap_1$instance<TKey> {
     Remove(key: TKey, entry: InternalEntityEntry): void;
     RemoveUsingRelationshipSnapshot(entry: InternalEntityEntry): void;
     TryGetEntry(entry: InternalEntityEntry): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
     TryGetEntry(foreignKey: IForeignKey, dependentEntry: InternalEntityEntry): InternalEntityEntry | undefined;
     TryGetEntryTyped(keyValue: TKey): InternalEntityEntry | undefined;
     TryGetEntryUsingPreStoreGeneratedValues(foreignKey: IForeignKey, dependentEntry: InternalEntityEntry): InternalEntityEntry | undefined;
@@ -742,19 +844,25 @@ export type IdentityMap_1<TKey> = IdentityMap_1$instance<TKey> & __IdentityMap_1
 
 
 export interface IdentityMapFactoryFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IdentityMapFactoryFactory: never;
+
 }
 
 
 export const IdentityMapFactoryFactory: {
     new(): IdentityMapFactoryFactory;
-    Create(key: IKey): Func<System_Internal.Boolean, IIdentityMap>;
-    CreateFactory<TKey>(key: IKey): Func<System_Internal.Boolean, IIdentityMap>;
+    Create(key: IKey): Func_2<System_Internal.Boolean, IIdentityMap>;
+    CreateFactory<TKey>(key: IKey): Func_2<System_Internal.Boolean, IIdentityMap>;
 };
 
 
 export type IdentityMapFactoryFactory = IdentityMapFactoryFactory$instance;
 
 export interface InternalComplexEntry$instance extends InternalEntryBase$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_InternalComplexEntry: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntry: never;
+
     readonly ComplexProperty: IComplexProperty;
     readonly ComplexType: IRuntimeComplexType;
     readonly ContainingEntry: InternalEntryBase;
@@ -766,13 +874,13 @@ export interface InternalComplexEntry$instance extends InternalEntryBase$instanc
     AcceptChanges(): void;
     DiscardStoreGeneratedValues(): void;
     FlaggedAsStoreGenerated(propertyIndex: int): boolean;
-    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList<InternalComplexEntry | undefined>;
+    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList_1<InternalComplexEntry | undefined>;
     GetComplexCollectionEntry(property: IComplexProperty, ordinal: int): InternalComplexEntry;
     GetCurrentValue<TProperty>(propertyBase: IPropertyBase): TProperty;
     GetCurrentValue(propertyBase: IPropertyBase): unknown | undefined;
-    GetFlattenedComplexEntries(): IEnumerable__System_Collections_Generic<InternalComplexEntry>;
-    GetOrdinals(): IReadOnlyList<System_Internal.Int32>;
-    GetOrdinals(): IReadOnlyList<System_Internal.Int32>;
+    GetFlattenedComplexEntries(): IEnumerable_1<InternalComplexEntry>;
+    GetOrdinals(): IReadOnlyList_1<System_Internal.Int32>;
+    GetOrdinals(): IReadOnlyList_1<System_Internal.Int32>;
     GetOriginalValue(propertyBase: IPropertyBase): unknown | undefined;
     GetOriginalValue<TProperty>(property: IProperty): TProperty;
     GetPropertyPath(property: IReadOnlyProperty): string;
@@ -792,7 +900,7 @@ export interface InternalComplexEntry$instance extends InternalEntryBase$instanc
     ReadPropertyValue(propertyBase: IPropertyBase): unknown | undefined;
     ReadStoreGeneratedValue<T>(storeGeneratedIndex: int): T;
     SetEntityState(oldState: EntityState, newState: EntityState, acceptChanges: boolean, modifyProperties: boolean): void;
-    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>): void;
+    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>): void;
     SetOriginalValue(propertyBase: IPropertyBase, value: unknown, index?: int): void;
     SetProperty(propertyBase: IPropertyBase, value: unknown, isMaterialization: boolean, setModified?: boolean, isCascadeDelete?: boolean): void;
     SetPropertyModified(property: IProperty, changeState?: boolean, isModified?: boolean, isConceptualNull?: boolean, acceptChanges?: boolean): void;
@@ -815,17 +923,22 @@ export type InternalComplexEntry = InternalComplexEntry$instance & __InternalCom
 
 
 export interface InternalEntityEntry$instance extends InternalEntryBase$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_InternalEntityEntry: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntry: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Update_IUpdateEntry: never;
+
     readonly DebugView: DebugView;
     readonly Entity: unknown;
     readonly EntityType: IRuntimeEntityType;
     readonly HasRelationshipSnapshot: boolean;
-    readonly IsKeySet: ValueTuple<System_Internal.Boolean, System_Internal.Boolean>;
+    readonly IsKeySet: ValueTuple_2<System_Internal.Boolean, System_Internal.Boolean>;
     readonly IsKeyUnknown: boolean;
     get SharedIdentityEntry(): InternalEntityEntry | undefined;
     set SharedIdentityEntry(value: InternalEntityEntry | undefined);
     readonly StateManager: IStateManager;
     AcceptChanges(): void;
-    AddRangeToCollectionSnapshot(navigation: INavigationBase, addedEntities: IEnumerable__System_Collections_Generic<unknown>): void;
+    AddRangeToCollectionSnapshot(navigation: INavigationBase, addedEntities: IEnumerable_1<unknown>): void;
     AddToCollection(navigationBase: INavigationBase, value: unknown, forMaterialization: boolean): boolean;
     AddToCollectionSnapshot(navigation: INavigationBase, addedEntity: unknown): void;
     CanHaveOriginalValue(propertyBase: IPropertyBase): boolean;
@@ -833,13 +946,13 @@ export interface InternalEntityEntry$instance extends InternalEntryBase$instance
     DiscardStoreGeneratedValues(): void;
     EnsureRelationshipSnapshot(): void;
     FlaggedAsStoreGenerated(propertyIndex: int): boolean;
-    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList<InternalComplexEntry | undefined>;
+    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList_1<InternalComplexEntry | undefined>;
     GetComplexCollectionEntry(property: IComplexProperty, ordinal: int): InternalComplexEntry;
     GetCurrentValue<TProperty>(propertyBase: IPropertyBase): TProperty;
     GetCurrentValue(propertyBase: IPropertyBase): unknown | undefined;
-    GetFlattenedComplexEntries(): IEnumerable__System_Collections_Generic<InternalComplexEntry>;
+    GetFlattenedComplexEntries(): IEnumerable_1<InternalComplexEntry>;
     GetOrCreateCollection(navigationBase: INavigationBase, forMaterialization: boolean): unknown;
-    GetOrdinals(): IReadOnlyList<System_Internal.Int32>;
+    GetOrdinals(): IReadOnlyList_1<System_Internal.Int32>;
     GetOriginalValue<TProperty>(property: IProperty): TProperty;
     GetOriginalValue(propertyBase: IPropertyBase): unknown | undefined;
     GetRelationshipSnapshotValue<TProperty>(propertyBase: IPropertyBase): TProperty;
@@ -867,11 +980,11 @@ export interface InternalEntityEntry$instance extends InternalEntryBase$instance
     ReadStoreGeneratedValue<T>(storeGeneratedIndex: int): T;
     RemoveFromCollection(navigationBase: INavigationBase, value: unknown): boolean;
     RemoveFromCollectionSnapshot(navigation: INavigationBase, removedEntity: unknown): void;
-    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>): void;
-    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>): void;
+    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>): void;
+    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>): void;
     SetEntityState(oldState: EntityState, newState: EntityState, acceptChanges: boolean, modifyProperties: boolean): void;
-    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>, cancellationToken?: CancellationToken): Task;
-    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>, cancellationToken?: CancellationToken): Task;
+    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>, cancellationToken?: CancellationToken): Task;
+    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>, cancellationToken?: CancellationToken): Task;
     SetIsLoaded(navigation: INavigationBase, loaded?: boolean): void;
     SetOriginalValue(propertyBase: IPropertyBase, value: unknown, index?: int): void;
     SetProperty(propertyBase: IPropertyBase, value: unknown, isMaterialization: boolean, setModified?: boolean, isCascadeDelete?: boolean): void;
@@ -888,7 +1001,7 @@ export interface InternalEntityEntry$instance extends InternalEntryBase$instance
 export const InternalEntityEntry: {
     new(stateManager: IStateManager, entityType: IEntityType, entity: unknown): InternalEntityEntry;
     new(stateManager: IStateManager, entityType: IEntityType, entity: unknown, shadowValues: ISnapshot): InternalEntityEntry;
-    new(stateManager: IStateManager, entityType: IEntityType, values: IDictionary<System_Internal.String, unknown>, entityMaterializerSource: IStructuralTypeMaterializerSource): InternalEntityEntry;
+    new(stateManager: IStateManager, entityType: IEntityType, values: IDictionary_2<System_Internal.String, unknown>, entityMaterializerSource: IStructuralTypeMaterializerSource): InternalEntityEntry;
 };
 
 
@@ -901,9 +1014,11 @@ export type InternalEntityEntry = InternalEntityEntry$instance & __InternalEntit
 
 
 export interface InternalEntityEntryNotifier$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_InternalEntityEntryNotifier: never;
+
     FixupResolved(entry: InternalEntityEntry, duplicateEntry: InternalEntityEntry): void;
-    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, keys: IEnumerable__System_Collections_Generic<IKey>, foreignKeys: IEnumerable__System_Collections_Generic<IForeignKey>, oldValue: unknown, newValue: unknown): void;
-    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable__System_Collections_Generic<unknown>, removed: IEnumerable__System_Collections_Generic<unknown>): void;
+    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, keys: IEnumerable_1<IKey>, foreignKeys: IEnumerable_1<IForeignKey>, oldValue: unknown, newValue: unknown): void;
+    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable_1<unknown>, removed: IEnumerable_1<unknown>): void;
     NavigationReferenceChanged(entry: InternalEntityEntry, navigation: INavigation, oldValue: unknown, newValue: unknown): void;
     PropertyChanged(entry: IInternalEntry, property: IPropertyBase, setModified: boolean): void;
     PropertyChanging(entry: IInternalEntry, property: IPropertyBase): void;
@@ -921,6 +1036,10 @@ export const InternalEntityEntryNotifier: {
 export type InternalEntityEntryNotifier = InternalEntityEntryNotifier$instance;
 
 export interface InternalEntryBase$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_InternalEntryBase: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IInternalEntry: never;
+
     readonly ContainingEntry: InternalEntryBase;
     readonly Context: DbContext;
     readonly EntityEntry: InternalEntityEntry;
@@ -941,15 +1060,15 @@ export interface InternalEntryBase$instance {
     EnsureTemporaryValues(): void;
     FlaggedAsStoreGenerated(propertyIndex: int): boolean;
     FlaggedAsTemporary(propertyIndex: int): boolean;
-    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList<InternalComplexEntry | undefined>;
+    GetComplexCollectionEntries(property: IComplexProperty): IReadOnlyList_1<InternalComplexEntry | undefined>;
     GetComplexCollectionEntry(property: IComplexProperty, ordinal: int): InternalComplexEntry;
-    GetComplexCollectionOriginalEntries(property: IComplexProperty): IReadOnlyList<InternalComplexEntry | undefined>;
+    GetComplexCollectionOriginalEntries(property: IComplexProperty): IReadOnlyList_1<InternalComplexEntry | undefined>;
     GetComplexCollectionOriginalEntry(property: IComplexProperty, ordinal: int): InternalComplexEntry;
     GetCurrentValue<TProperty>(propertyBase: IPropertyBase): TProperty;
     GetCurrentValue(propertyBase: IPropertyBase): unknown | undefined;
-    GetFlattenedComplexEntries(): IEnumerable__System_Collections_Generic<InternalComplexEntry>;
+    GetFlattenedComplexEntries(): IEnumerable_1<InternalComplexEntry>;
     GetOrCreateShadowCollection(navigation: INavigationBase): unknown;
-    GetOrdinals(): IReadOnlyList<System_Internal.Int32>;
+    GetOrdinals(): IReadOnlyList_1<System_Internal.Int32>;
     GetOriginalValue<TProperty>(property: IProperty): TProperty;
     GetOriginalValue(propertyBase: IPropertyBase): unknown | undefined;
     GetPreStoreGeneratedCurrentValue(propertyBase: IPropertyBase): unknown | undefined;
@@ -980,9 +1099,9 @@ export interface InternalEntryBase$instance {
     ReadShadowValue<T>(shadowIndex: int): T;
     ReadStoreGeneratedValue<T>(storeGeneratedIndex: int): T;
     ReadTemporaryValue<T>(storeGeneratedIndex: int): T;
-    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>): void;
+    SetEntityState(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>): void;
     SetEntityState(oldState: EntityState, newState: EntityState, acceptChanges: boolean, modifyProperties: boolean): void;
-    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable<EntityState>, fallbackState?: Nullable<EntityState>, cancellationToken?: CancellationToken): Task;
+    SetEntityStateAsync(entityState: EntityState, acceptChanges?: boolean, modifyProperties?: boolean, forceStateWhenUnknownKey?: Nullable_1<EntityState>, fallbackState?: Nullable_1<EntityState>, cancellationToken?: CancellationToken): Task;
     SetOriginalValue(propertyBase: IPropertyBase, value: unknown, index?: int): void;
     SetProperty(propertyBase: IPropertyBase, value: unknown, isMaterialization: boolean, setModified?: boolean, isCascadeDelete?: boolean): void;
     SetPropertyModified(property: IProperty, changeState?: boolean, isModified?: boolean, isConceptualNull?: boolean, acceptChanges?: boolean): void;
@@ -994,7 +1113,7 @@ export interface InternalEntryBase$instance {
 }
 
 
-export const InternalEntryBase: (abstract new(structuralType: IRuntimeTypeBase) => InternalEntryBase) & (abstract new(structuralType: IRuntimeTypeBase, shadowValues: ISnapshot) => InternalEntryBase) & (abstract new(structuralType: IRuntimeTypeBase, shadowValues: IDictionary<System_Internal.String, unknown>) => InternalEntryBase) & {
+export const InternalEntryBase: (abstract new(structuralType: IRuntimeTypeBase) => InternalEntryBase) & (abstract new(structuralType: IRuntimeTypeBase, shadowValues: ISnapshot) => InternalEntryBase) & (abstract new(structuralType: IRuntimeTypeBase, shadowValues: IDictionary_2<System_Internal.String, unknown>) => InternalEntryBase) & {
     readonly FlaggedAsTemporaryMethod: MethodInfo;
     readonly FlaggedAsStoreGeneratedMethod: MethodInfo;
 };
@@ -1008,6 +1127,8 @@ export type InternalEntryBase = InternalEntryBase$instance & __InternalEntryBase
 
 
 export interface InternalEntrySubscriber$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_InternalEntrySubscriber: never;
+
     SnapshotAndSubscribe(entry: InternalEntityEntry): boolean;
     SnapshotAndSubscribe(entry: InternalComplexEntry): boolean;
     SubscribeCollectionChanged(entry: InternalEntityEntry, navigation: INavigationBase): void;
@@ -1026,9 +1147,13 @@ export const InternalEntrySubscriber: {
 
 export type InternalEntrySubscriber = InternalEntrySubscriber$instance;
 
-export interface KeyPropagator$instance {
+export interface KeyPropagator$instance extends IKeyPropagator$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_KeyPropagator: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IKeyPropagator: never;
+
     PropagateValue(entry: InternalEntityEntry, property: IProperty): InternalEntityEntry | undefined;
-    PropagateValueAsync(entry: InternalEntityEntry, property: IProperty, cancellationToken?: CancellationToken): Task<InternalEntityEntry | undefined>;
+    PropagateValueAsync(entry: InternalEntityEntry, property: IProperty, cancellationToken?: CancellationToken): Task_1<InternalEntityEntry | undefined>;
 }
 
 
@@ -1041,12 +1166,12 @@ export interface __KeyPropagator$views {
     As_IKeyPropagator(): IKeyPropagator$instance;
 }
 
-export interface KeyPropagator$instance extends IKeyPropagator$instance {}
-
 export type KeyPropagator = KeyPropagator$instance & __KeyPropagator$views;
 
 
 export interface KeyValueFactoryFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_KeyValueFactoryFactory: never;
+
 }
 
 
@@ -1061,8 +1186,12 @@ export const KeyValueFactoryFactory: {
 
 export type KeyValueFactoryFactory = KeyValueFactoryFactory$instance;
 
-export interface LocalViewListener$instance {
-    RegisterView(viewAction: Action<InternalEntityEntry, EntityState>): void;
+export interface LocalViewListener$instance extends ILocalViewListener$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_LocalViewListener: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ILocalViewListener: never;
+
+    RegisterView(viewAction: Action_2<InternalEntityEntry, EntityState>): void;
     StateChanged(entry: InternalEntityEntry, oldState: EntityState, fromQuery: boolean): void;
     StateChanging(entry: InternalEntityEntry, newState: EntityState): void;
 }
@@ -1077,18 +1206,20 @@ export interface __LocalViewListener$views {
     As_ILocalViewListener(): ILocalViewListener$instance;
 }
 
-export interface LocalViewListener$instance extends ILocalViewListener$instance {}
-
 export type LocalViewListener = LocalViewListener$instance & __LocalViewListener$views;
 
 
-export interface NavigationFixer$instance {
+export interface NavigationFixer$instance extends INavigationFixer$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_NavigationFixer: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_INavigationFixer: never;
+
     AbortDelayedFixup(): void;
     BeginDelayedFixup(): boolean;
     CompleteDelayedFixup(): void;
     FixupResolved(entry: InternalEntityEntry, duplicateEntry: InternalEntityEntry): void;
-    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, containingPrincipalKeys: IEnumerable__System_Collections_Generic<IKey>, containingForeignKeys: IEnumerable__System_Collections_Generic<IForeignKey>, oldValue: unknown, newValue: unknown): void;
-    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable__System_Collections_Generic<unknown>, removed: IEnumerable__System_Collections_Generic<unknown>): void;
+    KeyPropertyChanged(entry: InternalEntityEntry, property: IProperty, containingPrincipalKeys: IEnumerable_1<IKey>, containingForeignKeys: IEnumerable_1<IForeignKey>, oldValue: unknown, newValue: unknown): void;
+    NavigationCollectionChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, added: IEnumerable_1<unknown>, removed: IEnumerable_1<unknown>): void;
     NavigationReferenceChanged(entry: InternalEntityEntry, navigationBase: INavigationBase, oldValue: unknown, newValue: unknown): void;
     StateChanged(entry: InternalEntityEntry, oldState: EntityState, fromQuery: boolean): void;
     StateChanging(entry: InternalEntityEntry, newState: EntityState): void;
@@ -1105,12 +1236,14 @@ export interface __NavigationFixer$views {
     As_INavigationFixer(): INavigationFixer$instance;
 }
 
-export interface NavigationFixer$instance extends INavigationFixer$instance {}
-
 export type NavigationFixer = NavigationFixer$instance & __NavigationFixer$views;
 
 
 export interface NullableClassCurrentProviderValueComparer_2$instance<TModel, TProvider> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_NullableClassCurrentProviderValueComparer_2: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+
     Compare(x: IUpdateEntry, y: IUpdateEntry): int;
 }
 
@@ -1123,17 +1256,22 @@ export const NullableClassCurrentProviderValueComparer_2: {
 export type NullableClassCurrentProviderValueComparer_2<TModel, TProvider> = NullableClassCurrentProviderValueComparer_2$instance<TModel, TProvider>;
 
 export interface NullableKeyIdentityMap_1$instance<TKey> extends IdentityMap_1$instance<TKey> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_NullableKeyIdentityMap_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IIdentityMap_1: never;
+
     Add(entry: InternalEntityEntry): void;
-    Add(keyValues: IReadOnlyList<unknown>, entry: InternalEntityEntry): void;
+    Add(keyValues: IReadOnlyList_1<unknown>, entry: InternalEntityEntry): void;
     Add(key: TKey, entry: InternalEntityEntry): void;
     AddOrUpdate(entry: InternalEntityEntry): void;
-    All(): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    All(): IEnumerable_1<InternalEntityEntry>;
     Clear(): void;
     GetDependentsMap(foreignKey: IForeignKey): IDependentsMap;
     RemoveUsingRelationshipSnapshot(entry: InternalEntityEntry): void;
     TryGetEntry(entry: InternalEntityEntry): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
-    TryGetEntry(keyValues: IReadOnlyList<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(keyValues: IReadOnlyList_1<unknown>, throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
     TryGetEntry(foreignKey: IForeignKey, dependentEntry: InternalEntityEntry): InternalEntityEntry | undefined;
     TryGetEntryTyped(keyValue: TKey): InternalEntityEntry | undefined;
 }
@@ -1153,6 +1291,10 @@ export type NullableKeyIdentityMap_1<TKey> = NullableKeyIdentityMap_1$instance<T
 
 
 export interface NullableStructCurrentProviderValueComparer_2$instance<TModel extends unknown, TProvider> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_NullableStructCurrentProviderValueComparer_2: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+
     Compare(x: IUpdateEntry, y: IUpdateEntry): int;
 }
 
@@ -1164,7 +1306,13 @@ export const NullableStructCurrentProviderValueComparer_2: {
 
 export type NullableStructCurrentProviderValueComparer_2<TModel, TProvider> = NullableStructCurrentProviderValueComparer_2$instance<TModel, TProvider>;
 
-export interface NullableValueComparer_1$instance<T extends unknown> extends ValueComparer_1<Nullable<T>> {
+export interface NullableValueComparer_1$instance<T extends unknown> extends ValueComparer_1<Nullable_1<T>>, Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer>, System_Collections_Generic_Internal.IEqualityComparer_1<unknown>, System_Collections_Generic_Internal.IEqualityComparer_1<Nullable_1<T>> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_NullableValueComparer_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IInfrastructure_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+    readonly __tsonic_iface_System_Collections_IEqualityComparer: never;
+
 }
 
 
@@ -1177,12 +1325,24 @@ export interface __NullableValueComparer_1$views<T extends unknown> {
     As_IInfrastructure_1(): Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer>;
 }
 
-export interface NullableValueComparer_1$instance<T extends unknown> extends Microsoft_EntityFrameworkCore_Infrastructure_Internal.IInfrastructure_1$instance<ValueComparer> {}
-
 export type NullableValueComparer_1<T> = NullableValueComparer_1$instance<T> & __NullableValueComparer_1$views<T>;
 
 
 export interface ObservableBackedBindingList_1$instance<T> extends SortableBindingList_1<T> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ObservableBackedBindingList_1: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_ICollection_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEnumerable_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IList_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IReadOnlyCollection_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IReadOnlyList_1: never;
+    readonly __tsonic_iface_System_Collections_ICollection: never;
+    readonly __tsonic_iface_System_Collections_IEnumerable: never;
+    readonly __tsonic_iface_System_Collections_IList: never;
+    readonly __tsonic_iface_System_ComponentModel_IBindingList: never;
+    readonly __tsonic_iface_System_ComponentModel_ICancelAddNew: never;
+    readonly __tsonic_iface_System_ComponentModel_IRaiseItemChangedEvents: never;
+
     AddNewCore(): unknown | undefined;
     CancelNew(itemIndex: int): void;
     ClearItems(): void;
@@ -1194,13 +1354,15 @@ export interface ObservableBackedBindingList_1$instance<T> extends SortableBindi
 
 
 export const ObservableBackedBindingList_1: {
-    new<T>(observableCollection: ICollection__System_Collections_Generic<T>): ObservableBackedBindingList_1<T>;
+    new<T>(observableCollection: ICollection_1<T>): ObservableBackedBindingList_1<T>;
 };
 
 
 export type ObservableBackedBindingList_1<T> = ObservableBackedBindingList_1$instance<T>;
 
 export interface OriginalPropertyValues$instance extends EntryPropertyValues {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_OriginalPropertyValues: never;
+
     GetComplexCollectionEntry(entry: InternalEntryBase, complexProperty: IComplexProperty, i: int): InternalComplexEntry;
     GetValue<TValue>(propertyName: string): TValue;
     GetValue<TValue>(property: IProperty): TValue;
@@ -1217,6 +1379,8 @@ export const OriginalPropertyValues: {
 export type OriginalPropertyValues = OriginalPropertyValues$instance;
 
 export interface OriginalValuesFactoryFactory$instance extends SnapshotFactoryFactory_1<IInternalEntry> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_OriginalValuesFactoryFactory: never;
+
     GetPropertyCount(structuralType: IRuntimeTypeBase): int;
     GetPropertyIndex(propertyBase: IPropertyBase): int;
     GetValueComparer(property: IProperty): ValueComparer | undefined;
@@ -1232,6 +1396,8 @@ export const OriginalValuesFactoryFactory: {
 export type OriginalValuesFactoryFactory = OriginalValuesFactoryFactory$instance;
 
 export interface RelationshipSnapshotFactoryFactory$instance extends SnapshotFactoryFactory_1<IInternalEntry> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_RelationshipSnapshotFactoryFactory: never;
+
     GetPropertyCount(structuralType: IRuntimeTypeBase): int;
     GetPropertyIndex(propertyBase: IPropertyBase): int;
     GetValueComparer(property: IProperty): ValueComparer | undefined;
@@ -1246,7 +1412,9 @@ export const RelationshipSnapshotFactoryFactory: {
 
 export type RelationshipSnapshotFactoryFactory = RelationshipSnapshotFactoryFactory$instance;
 
-export interface ShadowValuesFactoryFactory$instance extends SnapshotFactoryFactory_1<IDictionary<System_Internal.String, unknown>> {
+export interface ShadowValuesFactoryFactory$instance extends SnapshotFactoryFactory_1<IDictionary_2<System_Internal.String, unknown>> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ShadowValuesFactoryFactory: never;
+
     readonly UseEntityVariable: boolean;
     CreateReadShadowValueExpression(parameter: Expression, property: IPropertyBase): Expression;
     CreateReadValueExpression(parameter: Expression, property: IPropertyBase): Expression;
@@ -1265,6 +1433,8 @@ export const ShadowValuesFactoryFactory: {
 export type ShadowValuesFactoryFactory = ShadowValuesFactoryFactory$instance;
 
 export interface SidecarValuesFactoryFactory$instance extends SnapshotFactoryFactory_1<IInternalEntry> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SidecarValuesFactoryFactory: never;
+
     GetPropertyCount(structuralType: IRuntimeTypeBase): int;
     GetPropertyIndex(propertyBase: IPropertyBase): int;
     GetValueComparer(property: IProperty): ValueComparer | undefined;
@@ -1280,7 +1450,12 @@ export const SidecarValuesFactoryFactory: (abstract new() => SidecarValuesFactor
 export type SidecarValuesFactoryFactory = SidecarValuesFactoryFactory$instance;
 
 export interface SimpleFullyNullableDependentKeyValueFactory_1$instance<TKey> extends DependentKeyValueFactory_1<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SimpleFullyNullableDependentKeyValueFactory_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: TKey): boolean;
     TryCreateFromOriginalValues(entry: IUpdateEntry, key: TKey): boolean;
@@ -1303,7 +1478,12 @@ export type SimpleFullyNullableDependentKeyValueFactory_1<TKey> = SimpleFullyNul
 
 
 export interface SimpleNonNullableDependentKeyValueFactory_1$instance<TKey> extends DependentKeyValueFactory_1<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SimpleNonNullableDependentKeyValueFactory_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: TKey): boolean;
     TryCreateFromOriginalValues(entry: IUpdateEntry, key: TKey): boolean;
@@ -1326,7 +1506,12 @@ export type SimpleNonNullableDependentKeyValueFactory_1<TKey> = SimpleNonNullabl
 
 
 export interface SimpleNullableDependentKeyValueFactory_1$instance<TKey extends unknown> extends DependentKeyValueFactory_1<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SimpleNullableDependentKeyValueFactory_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: TKey): boolean;
     TryCreateFromOriginalValues(entry: IUpdateEntry, key: TKey): boolean;
@@ -1349,7 +1534,12 @@ export type SimpleNullableDependentKeyValueFactory_1<TKey> = SimpleNullableDepen
 
 
 export interface SimpleNullablePrincipalDependentKeyValueFactory_2$instance<TKey, TNonNullableKey extends unknown> extends DependentKeyValueFactory_1<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SimpleNullablePrincipalDependentKeyValueFactory_2: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IDependentKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreatePrincipalEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     TryCreateFromCurrentValues(entry: IUpdateEntry, key: TKey): boolean;
     TryCreateFromOriginalValues(entry: IUpdateEntry, key: TKey): boolean;
@@ -1372,14 +1562,19 @@ export type SimpleNullablePrincipalDependentKeyValueFactory_2<TKey, TNonNullable
 
 
 export interface SimplePrincipalKeyValueFactory_1$instance<TKey> {
-    readonly EqualityComparer: IEqualityComparer__System_Collections_Generic<TKey>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SimplePrincipalKeyValueFactory_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IPrincipalKeyValueFactory: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_IPrincipalKeyValueFactory_1: never;
+
+    readonly EqualityComparer: IEqualityComparer_1<TKey>;
     CreateEquatableKey(entry: IUpdateEntry, fromOriginalValues: boolean): unknown;
     CreateFromCurrentValues(entry: IUpdateEntry): TKey;
-    CreateFromKeyValues(keyValues: IReadOnlyList<unknown>): unknown | undefined;
+    CreateFromKeyValues(keyValues: IReadOnlyList_1<unknown>): unknown | undefined;
     CreateFromOriginalValues(entry: IUpdateEntry): TKey;
     CreateFromRelationshipSnapshot(entry: IUpdateEntry): TKey;
     FindNullPropertyInCurrentValues(entry: IUpdateEntry): IProperty;
-    FindNullPropertyInKeyValues(keyValues: IReadOnlyList<unknown>): IProperty;
+    FindNullPropertyInKeyValues(keyValues: IReadOnlyList_1<unknown>): IProperty;
 }
 
 
@@ -1396,7 +1591,11 @@ export interface __SimplePrincipalKeyValueFactory_1$views<TKey> {
 export type SimplePrincipalKeyValueFactory_1<TKey> = SimplePrincipalKeyValueFactory_1$instance<TKey> & __SimplePrincipalKeyValueFactory_1$views<TKey>;
 
 
-export interface Snapshot$instance {
+export interface Snapshot$instance extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1415,12 +1614,14 @@ export interface __Snapshot$views {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot$instance extends ISnapshot$instance {}
-
 export type Snapshot = Snapshot$instance & __Snapshot$views;
 
 
-export interface Snapshot_1$instance<T0> {
+export interface Snapshot_1$instance<T0> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_1: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1435,12 +1636,14 @@ export interface __Snapshot_1$views<T0> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_1$instance<T0> extends ISnapshot$instance {}
-
 export type Snapshot_1<T0> = Snapshot_1$instance<T0> & __Snapshot_1$views<T0>;
 
 
-export interface Snapshot_10$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+export interface Snapshot_10$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_10: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1455,12 +1658,14 @@ export interface __Snapshot_10$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_10$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> extends ISnapshot$instance {}
-
 export type Snapshot_10<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> = Snapshot_10$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> & __Snapshot_10$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>;
 
 
-export interface Snapshot_11$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> {
+export interface Snapshot_11$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_11: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1475,12 +1680,14 @@ export interface __Snapshot_11$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_11$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> extends ISnapshot$instance {}
-
 export type Snapshot_11<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> = Snapshot_11$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> & __Snapshot_11$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>;
 
 
-export interface Snapshot_12$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> {
+export interface Snapshot_12$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_12: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1495,12 +1702,14 @@ export interface __Snapshot_12$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_12$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> extends ISnapshot$instance {}
-
 export type Snapshot_12<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> = Snapshot_12$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> & __Snapshot_12$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11>;
 
 
-export interface Snapshot_13$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> {
+export interface Snapshot_13$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_13: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1515,12 +1724,14 @@ export interface __Snapshot_13$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_13$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> extends ISnapshot$instance {}
-
 export type Snapshot_13<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> = Snapshot_13$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12> & __Snapshot_13$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12>;
 
 
-export interface Snapshot_14$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> {
+export interface Snapshot_14$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_14: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1535,12 +1746,14 @@ export interface __Snapshot_14$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_14$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> extends ISnapshot$instance {}
-
 export type Snapshot_14<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> = Snapshot_14$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13> & __Snapshot_14$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13>;
 
 
-export interface Snapshot_15$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> {
+export interface Snapshot_15$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_15: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1555,12 +1768,14 @@ export interface __Snapshot_15$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_15$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> extends ISnapshot$instance {}
-
 export type Snapshot_15<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> = Snapshot_15$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14> & __Snapshot_15$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14>;
 
 
-export interface Snapshot_16$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> {
+export interface Snapshot_16$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_16: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1575,12 +1790,14 @@ export interface __Snapshot_16$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_16$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> extends ISnapshot$instance {}
-
 export type Snapshot_16<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> = Snapshot_16$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15> & __Snapshot_16$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15>;
 
 
-export interface Snapshot_17$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> {
+export interface Snapshot_17$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_17: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1595,12 +1812,14 @@ export interface __Snapshot_17$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_17$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> extends ISnapshot$instance {}
-
 export type Snapshot_17<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> = Snapshot_17$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16> & __Snapshot_17$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16>;
 
 
-export interface Snapshot_18$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> {
+export interface Snapshot_18$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_18: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1615,12 +1834,14 @@ export interface __Snapshot_18$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_18$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> extends ISnapshot$instance {}
-
 export type Snapshot_18<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> = Snapshot_18$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17> & __Snapshot_18$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17>;
 
 
-export interface Snapshot_19$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> {
+export interface Snapshot_19$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_19: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1635,12 +1856,14 @@ export interface __Snapshot_19$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_19$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> extends ISnapshot$instance {}
-
 export type Snapshot_19<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> = Snapshot_19$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18> & __Snapshot_19$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18>;
 
 
-export interface Snapshot_2$instance<T0, T1> {
+export interface Snapshot_2$instance<T0, T1> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_2: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1655,12 +1878,14 @@ export interface __Snapshot_2$views<T0, T1> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_2$instance<T0, T1> extends ISnapshot$instance {}
-
 export type Snapshot_2<T0, T1> = Snapshot_2$instance<T0, T1> & __Snapshot_2$views<T0, T1>;
 
 
-export interface Snapshot_20$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> {
+export interface Snapshot_20$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_20: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1675,12 +1900,14 @@ export interface __Snapshot_20$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_20$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> extends ISnapshot$instance {}
-
 export type Snapshot_20<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> = Snapshot_20$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19> & __Snapshot_20$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19>;
 
 
-export interface Snapshot_21$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> {
+export interface Snapshot_21$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_21: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1695,12 +1922,14 @@ export interface __Snapshot_21$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_21$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> extends ISnapshot$instance {}
-
 export type Snapshot_21<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> = Snapshot_21$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20> & __Snapshot_21$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20>;
 
 
-export interface Snapshot_22$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> {
+export interface Snapshot_22$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_22: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1715,12 +1944,14 @@ export interface __Snapshot_22$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_22$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> extends ISnapshot$instance {}
-
 export type Snapshot_22<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> = Snapshot_22$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21> & __Snapshot_22$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>;
 
 
-export interface Snapshot_23$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> {
+export interface Snapshot_23$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_23: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1735,12 +1966,14 @@ export interface __Snapshot_23$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_23$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> extends ISnapshot$instance {}
-
 export type Snapshot_23<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> = Snapshot_23$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22> & __Snapshot_23$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>;
 
 
-export interface Snapshot_24$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> {
+export interface Snapshot_24$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_24: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1755,12 +1988,14 @@ export interface __Snapshot_24$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_24$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> extends ISnapshot$instance {}
-
 export type Snapshot_24<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> = Snapshot_24$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> & __Snapshot_24$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23>;
 
 
-export interface Snapshot_25$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> {
+export interface Snapshot_25$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_25: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1775,12 +2010,14 @@ export interface __Snapshot_25$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_25$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> extends ISnapshot$instance {}
-
 export type Snapshot_25<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> = Snapshot_25$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> & __Snapshot_25$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24>;
 
 
-export interface Snapshot_26$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> {
+export interface Snapshot_26$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_26: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1795,12 +2032,14 @@ export interface __Snapshot_26$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_26$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> extends ISnapshot$instance {}
-
 export type Snapshot_26<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> = Snapshot_26$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> & __Snapshot_26$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25>;
 
 
-export interface Snapshot_27$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> {
+export interface Snapshot_27$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_27: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1815,12 +2054,14 @@ export interface __Snapshot_27$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_27$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> extends ISnapshot$instance {}
-
 export type Snapshot_27<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> = Snapshot_27$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26> & __Snapshot_27$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26>;
 
 
-export interface Snapshot_28$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> {
+export interface Snapshot_28$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_28: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1835,12 +2076,14 @@ export interface __Snapshot_28$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_28$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> extends ISnapshot$instance {}
-
 export type Snapshot_28<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> = Snapshot_28$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27> & __Snapshot_28$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27>;
 
 
-export interface Snapshot_29$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> {
+export interface Snapshot_29$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_29: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1855,12 +2098,14 @@ export interface __Snapshot_29$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_29$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> extends ISnapshot$instance {}
-
 export type Snapshot_29<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> = Snapshot_29$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28> & __Snapshot_29$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28>;
 
 
-export interface Snapshot_3$instance<T0, T1, T2> {
+export interface Snapshot_3$instance<T0, T1, T2> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_3: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1875,12 +2120,14 @@ export interface __Snapshot_3$views<T0, T1, T2> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_3$instance<T0, T1, T2> extends ISnapshot$instance {}
-
 export type Snapshot_3<T0, T1, T2> = Snapshot_3$instance<T0, T1, T2> & __Snapshot_3$views<T0, T1, T2>;
 
 
-export interface Snapshot_30$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29> {
+export interface Snapshot_30$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_30: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1895,12 +2142,14 @@ export interface __Snapshot_30$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_30$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29> extends ISnapshot$instance {}
-
 export type Snapshot_30<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29> = Snapshot_30$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29> & __Snapshot_30$views<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28, T29>;
 
 
-export interface Snapshot_4$instance<T0, T1, T2, T3> {
+export interface Snapshot_4$instance<T0, T1, T2, T3> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_4: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1915,12 +2164,14 @@ export interface __Snapshot_4$views<T0, T1, T2, T3> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_4$instance<T0, T1, T2, T3> extends ISnapshot$instance {}
-
 export type Snapshot_4<T0, T1, T2, T3> = Snapshot_4$instance<T0, T1, T2, T3> & __Snapshot_4$views<T0, T1, T2, T3>;
 
 
-export interface Snapshot_5$instance<T0, T1, T2, T3, T4> {
+export interface Snapshot_5$instance<T0, T1, T2, T3, T4> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_5: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1935,12 +2186,14 @@ export interface __Snapshot_5$views<T0, T1, T2, T3, T4> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_5$instance<T0, T1, T2, T3, T4> extends ISnapshot$instance {}
-
 export type Snapshot_5<T0, T1, T2, T3, T4> = Snapshot_5$instance<T0, T1, T2, T3, T4> & __Snapshot_5$views<T0, T1, T2, T3, T4>;
 
 
-export interface Snapshot_6$instance<T0, T1, T2, T3, T4, T5> {
+export interface Snapshot_6$instance<T0, T1, T2, T3, T4, T5> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_6: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1955,12 +2208,14 @@ export interface __Snapshot_6$views<T0, T1, T2, T3, T4, T5> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_6$instance<T0, T1, T2, T3, T4, T5> extends ISnapshot$instance {}
-
 export type Snapshot_6<T0, T1, T2, T3, T4, T5> = Snapshot_6$instance<T0, T1, T2, T3, T4, T5> & __Snapshot_6$views<T0, T1, T2, T3, T4, T5>;
 
 
-export interface Snapshot_7$instance<T0, T1, T2, T3, T4, T5, T6> {
+export interface Snapshot_7$instance<T0, T1, T2, T3, T4, T5, T6> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_7: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1975,12 +2230,14 @@ export interface __Snapshot_7$views<T0, T1, T2, T3, T4, T5, T6> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_7$instance<T0, T1, T2, T3, T4, T5, T6> extends ISnapshot$instance {}
-
 export type Snapshot_7<T0, T1, T2, T3, T4, T5, T6> = Snapshot_7$instance<T0, T1, T2, T3, T4, T5, T6> & __Snapshot_7$views<T0, T1, T2, T3, T4, T5, T6>;
 
 
-export interface Snapshot_8$instance<T0, T1, T2, T3, T4, T5, T6, T7> {
+export interface Snapshot_8$instance<T0, T1, T2, T3, T4, T5, T6, T7> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_8: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -1995,12 +2252,14 @@ export interface __Snapshot_8$views<T0, T1, T2, T3, T4, T5, T6, T7> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_8$instance<T0, T1, T2, T3, T4, T5, T6, T7> extends ISnapshot$instance {}
-
 export type Snapshot_8<T0, T1, T2, T3, T4, T5, T6, T7> = Snapshot_8$instance<T0, T1, T2, T3, T4, T5, T6, T7> & __Snapshot_8$views<T0, T1, T2, T3, T4, T5, T6, T7>;
 
 
-export interface Snapshot_9$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
+export interface Snapshot_9$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8> extends ISnapshot$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_Snapshot_9: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ISnapshot: never;
+
     [index: number]: unknown | undefined;
     GetValue<T>(index: int): T;
 }
@@ -2015,19 +2274,19 @@ export interface __Snapshot_9$views<T0, T1, T2, T3, T4, T5, T6, T7, T8> {
     As_ISnapshot(): ISnapshot$instance;
 }
 
-export interface Snapshot_9$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8> extends ISnapshot$instance {}
-
 export type Snapshot_9<T0, T1, T2, T3, T4, T5, T6, T7, T8> = Snapshot_9$instance<T0, T1, T2, T3, T4, T5, T6, T7, T8> & __Snapshot_9$views<T0, T1, T2, T3, T4, T5, T6, T7, T8>;
 
 
 export interface SnapshotFactoryFactory$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SnapshotFactoryFactory: never;
+
     readonly UseEntityVariable: boolean;
     CreateConstructorExpression(structuralType: IRuntimeTypeBase, parameter: Expression): Expression;
-    CreateEmpty(structuralType: IRuntimeTypeBase): Func<ISnapshot>;
-    CreateEmptyExpression(structuralType: IRuntimeTypeBase): Expression<Func<ISnapshot>>;
+    CreateEmpty(structuralType: IRuntimeTypeBase): Func_1<ISnapshot>;
+    CreateEmptyExpression(structuralType: IRuntimeTypeBase): Expression_1<Func_1<ISnapshot>>;
     CreateReadShadowValueExpression(parameter: Expression, property: IPropertyBase): Expression;
     CreateReadValueExpression(parameter: Expression, property: IPropertyBase): Expression;
-    CreateSnapshotExpression(clrType: Type, parameter: Expression, types: Type[], propertyBases: IList__System_Collections_Generic<IPropertyBase>): Expression;
+    CreateSnapshotExpression(clrType: Type, parameter: Expression, types: Type[], propertyBases: IList_1<IPropertyBase>): Expression;
     GetPropertyCount(structuralType: IRuntimeTypeBase): int;
     GetPropertyIndex(propertyBase: IPropertyBase): int;
     GetValueComparer(property: IProperty): ValueComparer | undefined;
@@ -2036,7 +2295,7 @@ export interface SnapshotFactoryFactory$instance {
 
 
 export const SnapshotFactoryFactory: (abstract new() => SnapshotFactoryFactory) & {
-    SnapshotCollection(collection: IEnumerable): HashSet<unknown> | undefined;
+    SnapshotCollection(collection: IEnumerable): HashSet_1<unknown> | undefined;
     SnapshotComplexCollection(list: IList, complexProperty: IRuntimeComplexProperty): IList | undefined;
 };
 
@@ -2044,8 +2303,10 @@ export const SnapshotFactoryFactory: (abstract new() => SnapshotFactoryFactory)
 export type SnapshotFactoryFactory = SnapshotFactoryFactory$instance;
 
 export interface SnapshotFactoryFactory_1$instance<TInput> extends SnapshotFactoryFactory {
-    Create(structuralType: IRuntimeTypeBase): Func<TInput, ISnapshot>;
-    CreateExpression(structuralType: IRuntimeTypeBase): Expression<Func<TInput, ISnapshot>>;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SnapshotFactoryFactory_1: never;
+
+    Create(structuralType: IRuntimeTypeBase): Func_2<TInput, ISnapshot>;
+    CreateExpression(structuralType: IRuntimeTypeBase): Expression_1<Func_2<TInput, ISnapshot>>;
 }
 
 
@@ -2055,7 +2316,21 @@ export const SnapshotFactoryFactory_1: (abstract new<TInput>() => SnapshotFactor
 
 export type SnapshotFactoryFactory_1<TInput> = SnapshotFactoryFactory_1$instance<TInput>;
 
-export interface SortableBindingList_1$instance<T> extends BindingList<T> {
+export interface SortableBindingList_1$instance<T> extends BindingList_1<T> {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_SortableBindingList_1: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_ICollection_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEnumerable_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IList_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IReadOnlyCollection_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IReadOnlyList_1: never;
+    readonly __tsonic_iface_System_Collections_ICollection: never;
+    readonly __tsonic_iface_System_Collections_IEnumerable: never;
+    readonly __tsonic_iface_System_Collections_IList: never;
+    readonly __tsonic_iface_System_ComponentModel_IBindingList: never;
+    readonly __tsonic_iface_System_ComponentModel_ICancelAddNew: never;
+    readonly __tsonic_iface_System_ComponentModel_IRaiseItemChangedEvents: never;
+
     readonly IsSortedCore: boolean;
     readonly SortDirectionCore: ListSortDirection;
     readonly SortPropertyCore: PropertyDescriptor | undefined;
@@ -2066,13 +2341,18 @@ export interface SortableBindingList_1$instance<T> extends BindingList<T> {
 
 
 export const SortableBindingList_1: {
-    new<T>(list: List<T>): SortableBindingList_1<T>;
+    new<T>(list: List_1<T>): SortableBindingList_1<T>;
 };
 
 
 export type SortableBindingList_1<T> = SortableBindingList_1$instance<T>;
 
 export interface StateManager$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_StateManager: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IStateManager: never;
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_Infrastructure_IResettableService: never;
+
     CascadeDeleteTiming: CascadeTiming;
     ChangedCount: int;
     readonly ChangeDetector: IChangeDetector;
@@ -2082,7 +2362,7 @@ export interface StateManager$instance {
     readonly Dependencies: StateManagerDependencies;
     readonly EntityFinderFactory: IEntityFinderFactory;
     readonly EntityMaterializerSource: IStructuralTypeMaterializerSource;
-    readonly Entries: IEnumerable__System_Collections_Generic<InternalEntityEntry>;
+    readonly Entries: IEnumerable_1<InternalEntityEntry>;
     readonly InternalEntityEntryNotifier: IInternalEntityEntryNotifier;
     readonly Model: IModel;
     SavingChanges: boolean;
@@ -2092,29 +2372,29 @@ export interface StateManager$instance {
     AbortAttachGraph(): void;
     AcceptAllChanges(): void;
     BeginAttachGraph(): void;
-    CaptureEvents(): ValueTuple<EventHandler<EntityTrackingEventArgs>, EventHandler<EntityTrackedEventArgs>, EventHandler<EntityStateChangingEventArgs>, EventHandler<EntityStateChangedEventArgs>>;
+    CaptureEvents(): ValueTuple_4<EventHandler_1<EntityTrackingEventArgs>, EventHandler_1<EntityTrackedEventArgs>, EventHandler_1<EntityStateChangingEventArgs>, EventHandler_1<EntityStateChangedEventArgs>>;
     CascadeChanges(force: boolean): void;
-    CascadeDelete(entry: InternalEntityEntry, force: boolean, foreignKeys?: IEnumerable__System_Collections_Generic<IForeignKey>): void;
+    CascadeDelete(entry: InternalEntityEntry, force: boolean, foreignKeys?: IEnumerable_1<IForeignKey>): void;
     ChangingState(entry: InternalEntityEntry, newState: EntityState): void;
     Clear(resetting: boolean): void;
     CompleteAttachGraph(): void;
     CreateEntityFinder(entityType: IEntityType): IEntityFinder;
-    CreateEntry(values: IDictionary<System_Internal.String, unknown>, entityType: IEntityType): InternalEntityEntry;
+    CreateEntry(values: IDictionary_2<System_Internal.String, unknown>, entityType: IEntityType): InternalEntityEntry;
     FindPrincipal(dependentEntry: InternalEntityEntry, foreignKey: IForeignKey): InternalEntityEntry | undefined;
     FindPrincipalUsingPreStoreGeneratedValues(dependentEntry: InternalEntityEntry, foreignKey: IForeignKey): InternalEntityEntry | undefined;
     FindPrincipalUsingRelationshipSnapshot(dependentEntry: InternalEntityEntry, foreignKey: IForeignKey): InternalEntityEntry | undefined;
     GetCountForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, countDeletedSharedIdentity?: boolean): int;
-    GetDependents(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependents(keyValues: IReadOnlyList<unknown>, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetDependentsFromNavigation(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry> | undefined;
-    GetDependentsUsingRelationshipSnapshot(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable__System_Collections_Generic<IUpdateEntry>;
-    GetEntries(key: IKey): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
-    GetEntriesForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnDeletedSharedIdentity?: boolean): IEnumerable__System_Collections_Generic<InternalEntityEntry>;
-    GetEntriesToSave(cascadeChanges: boolean): IList__System_Collections_Generic<IUpdateEntry>;
-    GetNonDeletedEntities<TEntity>(): IEnumerable__System_Collections_Generic<TEntity>;
+    GetDependents(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry>;
+    GetDependents(keyValues: IReadOnlyList_1<unknown>, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry>;
+    GetDependentsFromNavigation(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry> | undefined;
+    GetDependentsUsingRelationshipSnapshot(principalEntry: IUpdateEntry, foreignKey: IForeignKey): IEnumerable_1<IUpdateEntry>;
+    GetEntries(key: IKey): IEnumerable_1<InternalEntityEntry>;
+    GetEntriesForState(added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnDeletedSharedIdentity?: boolean): IEnumerable_1<InternalEntityEntry>;
+    GetEntriesToSave(cascadeChanges: boolean): IList_1<IUpdateEntry>;
+    GetNonDeletedEntities<TEntity>(): IEnumerable_1<TEntity>;
     GetOrCreateEntry(entity: unknown): InternalEntityEntry;
     GetOrCreateEntry(entity: unknown, entityType: IEntityType): InternalEntityEntry;
-    GetRecordedReferrers(referencedEntity: unknown, clear: boolean): IEnumerable__System_Collections_Generic<Tuple<INavigationBase, InternalEntityEntry>>;
+    GetRecordedReferrers(referencedEntity: unknown, clear: boolean): IEnumerable_1<Tuple_2<INavigationBase, InternalEntityEntry>>;
     OnStateChanged(internalEntityEntry: InternalEntityEntry, oldState: EntityState): void;
     OnStateChanging(internalEntityEntry: InternalEntityEntry, newState: EntityState): void;
     OnTracked(internalEntityEntry: InternalEntityEntry, fromQuery: boolean): void;
@@ -2123,17 +2403,17 @@ export interface StateManager$instance {
     ResetState(): void;
     ResetStateAsync(cancellationToken?: CancellationToken): Task;
     ResolveToExistingEntry(newEntry: InternalEntityEntry, navigation: INavigationBase, referencedFromEntry: InternalEntityEntry): boolean;
-    SaveChanges(entriesToSave: IList__System_Collections_Generic<IUpdateEntry>): int;
+    SaveChanges(entriesToSave: IList_1<IUpdateEntry>): int;
     SaveChanges(acceptAllChangesOnSuccess: boolean): int;
-    SaveChangesAsync(entriesToSave: IList__System_Collections_Generic<IUpdateEntry>, cancellationToken?: CancellationToken): Task<System_Internal.Int32>;
-    SaveChangesAsync(acceptAllChangesOnSuccess: boolean, cancellationToken?: CancellationToken): Task<System_Internal.Int32>;
-    SetEvents(tracking: EventHandler<EntityTrackingEventArgs>, tracked: EventHandler<EntityTrackedEventArgs>, stateChanging: EventHandler<EntityStateChangingEventArgs>, stateChanged: EventHandler<EntityStateChangedEventArgs>): void;
+    SaveChangesAsync(entriesToSave: IList_1<IUpdateEntry>, cancellationToken?: CancellationToken): Task_1<System_Internal.Int32>;
+    SaveChangesAsync(acceptAllChangesOnSuccess: boolean, cancellationToken?: CancellationToken): Task_1<System_Internal.Int32>;
+    SetEvents(tracking: EventHandler_1<EntityTrackingEventArgs>, tracked: EventHandler_1<EntityTrackedEventArgs>, stateChanging: EventHandler_1<EntityStateChangingEventArgs>, stateChanged: EventHandler_1<EntityStateChangedEventArgs>): void;
     StartTracking(entry: InternalEntityEntry): InternalEntityEntry;
     StartTracking(entry: InternalComplexEntry): InternalComplexEntry;
     StartTrackingFromQuery(baseEntityType: IEntityType, entity: unknown, snapshot: ISnapshot): InternalEntityEntry;
     StopTracking(entry: InternalEntityEntry, oldState: EntityState): void;
     StopTracking(entry: InternalComplexEntry, oldState: EntityState): void;
-    TryGetEntry(key: IKey, keyValues: IReadOnlyList<unknown>): InternalEntityEntry | undefined;
+    TryGetEntry(key: IKey, keyValues: IReadOnlyList_1<unknown>): InternalEntityEntry | undefined;
     TryGetEntry(key: IKey, keyValues: unknown[], throwOnNullKey: boolean, hasNullKey: boolean): InternalEntityEntry | undefined;
     TryGetEntry(entity: unknown, throwOnNonUniqueness?: boolean): InternalEntityEntry | undefined;
     TryGetEntry(entity: unknown, entityType: IEntityType, throwOnTypeMismatch?: boolean): InternalEntityEntry | undefined;
@@ -2160,6 +2440,10 @@ export type StateManager = StateManager$instance & __StateManager$views;
 
 
 export interface StateManagerDependencies$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_StateManagerDependencies: never;
+
+    readonly __tsonic_iface_System_IEquatable_1: never;
+
     ChangeTrackingLogger: IDiagnosticsLogger_1<DbLoggerCategory_ChangeTracking>;
     ConcurrencyDetector: IConcurrencyDetector;
     CoreSingletonOptions: ICoreSingletonOptions;
@@ -2193,6 +2477,8 @@ export const StateManagerDependencies: {
 export type StateManagerDependencies = StateManagerDependencies$instance;
 
 export interface StoreGeneratedValuesFactoryFactory$instance extends SidecarValuesFactoryFactory {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_StoreGeneratedValuesFactoryFactory: never;
+
     readonly UseEntityVariable: boolean;
     CreateReadShadowValueExpression(parameter: Expression, property: IPropertyBase): Expression;
     CreateReadValueExpression(parameter: Expression, property: IPropertyBase): Expression;
@@ -2206,6 +2492,11 @@ export const StoreGeneratedValuesFactoryFactory: {
 export type StoreGeneratedValuesFactoryFactory = StoreGeneratedValuesFactoryFactory$instance;
 
 export interface StructuralEntryCurrentProviderValueComparer$instance extends StructuralEntryCurrentValueComparer {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_StructuralEntryCurrentProviderValueComparer: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+
     GetPropertyValue(entry: IUpdateEntry): unknown | undefined;
 }
 
@@ -2218,6 +2509,11 @@ export const StructuralEntryCurrentProviderValueComparer: {
 export type StructuralEntryCurrentProviderValueComparer = StructuralEntryCurrentProviderValueComparer$instance;
 
 export interface StructuralEntryCurrentValueComparer$instance extends EntryCurrentValueComparer {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_StructuralEntryCurrentValueComparer: never;
+
+    readonly __tsonic_iface_System_Collections_Generic_IComparer_1: never;
+    readonly __tsonic_iface_System_Collections_Generic_IEqualityComparer_1: never;
+
     Compare(x: IUpdateEntry, y: IUpdateEntry): int;
 }
 
@@ -2230,8 +2526,10 @@ export const StructuralEntryCurrentValueComparer: {
 export type StructuralEntryCurrentValueComparer = StructuralEntryCurrentValueComparer$instance;
 
 export interface TemporaryValuesFactoryFactory$instance extends SidecarValuesFactoryFactory {
-    CreateSnapshotExpression(entityType: Type, parameter: Expression, types: Type[], propertyBases: IList__System_Collections_Generic<IPropertyBase>): Expression;
-    CreateSnapshotExpression(clrType: Type, parameter: Expression, types: Type[], propertyBases: IList__System_Collections_Generic<IPropertyBase>): Expression;
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_TemporaryValuesFactoryFactory: never;
+
+    CreateSnapshotExpression(entityType: Type, parameter: Expression, types: Type[], propertyBases: IList_1<IPropertyBase>): Expression;
+    CreateSnapshotExpression(clrType: Type, parameter: Expression, types: Type[], propertyBases: IList_1<IPropertyBase>): Expression;
 }
 
 
@@ -2241,11 +2539,15 @@ export const TemporaryValuesFactoryFactory: {
 
 export type TemporaryValuesFactoryFactory = TemporaryValuesFactoryFactory$instance;
 
-export interface ValueGenerationManager$instance {
+export interface ValueGenerationManager$instance extends IValueGenerationManager$instance {
+    readonly __tsonic_type_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_ValueGenerationManager: never;
+
+    readonly __tsonic_iface_Microsoft_EntityFrameworkCore_ChangeTracking_Internal_IValueGenerationManager: never;
+
     Generate(entry: InternalEntityEntry, includePrimaryKey?: boolean): boolean;
-    GenerateAsync(entry: InternalEntityEntry, includePrimaryKey?: boolean, cancellationToken?: CancellationToken): Task<System_Internal.Boolean>;
+    GenerateAsync(entry: InternalEntityEntry, includePrimaryKey?: boolean, cancellationToken?: CancellationToken): Task_1<System_Internal.Boolean>;
     Propagate(entry: InternalEntityEntry): InternalEntityEntry | undefined;
-    PropagateAsync(entry: InternalEntityEntry, cancellationToken: CancellationToken): Task<InternalEntityEntry | undefined>;
+    PropagateAsync(entry: InternalEntityEntry, cancellationToken: CancellationToken): Task_1<InternalEntityEntry | undefined>;
 }
 
 
@@ -2258,14 +2560,12 @@ export interface __ValueGenerationManager$views {
     As_IValueGenerationManager(): IValueGenerationManager$instance;
 }
 
-export interface ValueGenerationManager$instance extends IValueGenerationManager$instance {}
-
 export type ValueGenerationManager = ValueGenerationManager$instance & __ValueGenerationManager$views;
 
 
 export abstract class StateManagerExtensions$instance {
-    static ToList(stateManager: IStateManager): IReadOnlyList<InternalEntityEntry>;
-    static ToListForState(stateManager: IStateManager, added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnDeletedSharedIdentity?: boolean): IReadOnlyList<InternalEntityEntry>;
+    static ToList(stateManager: IStateManager): IReadOnlyList_1<InternalEntityEntry>;
+    static ToListForState(stateManager: IStateManager, added?: boolean, modified?: boolean, deleted?: boolean, unchanged?: boolean, returnDeletedSharedIdentity?: boolean): IReadOnlyList_1<InternalEntityEntry>;
 }