@tsonic/aspnetcore 10.0.5 → 10.0.7

package/Microsoft.AspNetCore.Mvc.ModelBinding.Validation/internal/index.d.ts

@@ -11,12 +11,12 @@ import type { ptr } from "@tsonic/core/types.js";
 // Import types from other namespaces
 import type { IModelMetadataProvider, ModelMetadata, ModelStateDictionary } from "../../Microsoft.AspNetCore.Mvc.ModelBinding/internal/index.js";
 import type { ActionContext } from "../../Microsoft.AspNetCore.Mvc/internal/index.js";
-import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { ICollection, IDictionary, IEnumerable as IEnumerable__System_Collections_Generic, IEnumerator, IList, IReadOnlyCollection, IReadOnlyDictionary, IReadOnlyList, KeyValuePair } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections.js";
-import type { IEnumerable } from "@tsonic/dotnet/System.Collections.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Attribute, Boolean as ClrBoolean, Func, Int32, Nullable, Object as ClrObject, String as ClrString, Type, ValueType, Void } from "@tsonic/dotnet/System.js";
+import * as System_Collections_Generic_Internal from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { ICollection_1, IDictionary_2, IEnumerable_1, IEnumerator_1, IList_1, IReadOnlyCollection_1, IReadOnlyDictionary_2, IReadOnlyList_1, KeyValuePair_2 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import * as System_Collections_Internal from "@tsonic/dotnet/System.Collections/internal/index.js";
+import type { IEnumerable } from "@tsonic/dotnet/System.Collections/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Attribute, Boolean as ClrBoolean, Func_1, Int32, Nullable_1, Object as ClrObject, String as ClrString, Type, ValueType, Void } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface IClientModelValidator$instance {
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IClientModelValidator: never;
@@ -40,7 +40,7 @@ export interface IMetadataBasedModelValidatorProvider$instance extends IModelVal
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IMetadataBasedModelValidatorProvider: never;
 
     CreateValidators(context: ModelValidatorProviderContext): void;
-    HasValidators(modelType: Type, validatorMetadata: IList<unknown>): boolean;
+    HasValidators(modelType: Type, validatorMetadata: IList_1<unknown>): boolean;
 }
 
 
@@ -51,7 +51,7 @@ export type IMetadataBasedModelValidatorProvider = IMetadataBasedModelValidatorP
 export interface IModelValidator$instance {
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IModelValidator: never;
 
-    Validate(context: ModelValidationContext): IEnumerable__System_Collections_Generic<ModelValidationResult>;
+    Validate(context: ModelValidationContext): IEnumerable_1<ModelValidationResult>;
 }
 
 
@@ -87,13 +87,15 @@ export type IPropertyValidationFilter = IPropertyValidationFilter$instance;
 export interface IValidationStrategy$instance {
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IValidationStrategy: never;
 
-    GetChildren(metadata: ModelMetadata, key: string, model: unknown): IEnumerator<ValidationEntry>;
+    GetChildren(metadata: ModelMetadata, key: string, model: unknown): IEnumerator_1<ValidationEntry>;
 }
 
 
 export type IValidationStrategy = IValidationStrategy$instance;
 
 export interface ValidationEntry$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidationEntry: never;
+
     readonly Key: string;
     readonly Metadata: ModelMetadata;
     readonly Model: unknown | undefined;
@@ -102,26 +104,30 @@ export interface ValidationEntry$instance {
 
 export const ValidationEntry: {
     new(metadata: ModelMetadata, key: string, model: unknown): ValidationEntry;
-    new(metadata: ModelMetadata, key: string, modelAccessor: Func<unknown>): ValidationEntry;
+    new(metadata: ModelMetadata, key: string, modelAccessor: Func_1<unknown>): ValidationEntry;
 };
 
 
 export type ValidationEntry = ValidationEntry$instance;
 
 export interface ClientModelValidationContext$instance extends ModelValidationContextBase {
-    readonly Attributes: IDictionary<System_Internal.String, System_Internal.String>;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ClientModelValidationContext: never;
+
+    readonly Attributes: IDictionary_2<System_Internal.String, System_Internal.String>;
 }
 
 
 export const ClientModelValidationContext: {
-    new(actionContext: ActionContext, metadata: ModelMetadata, metadataProvider: IModelMetadataProvider, attributes: IDictionary<System_Internal.String, System_Internal.String>): ClientModelValidationContext;
+    new(actionContext: ActionContext, metadata: ModelMetadata, metadataProvider: IModelMetadataProvider, attributes: IDictionary_2<System_Internal.String, System_Internal.String>): ClientModelValidationContext;
 };
 
 
 export type ClientModelValidationContext = ClientModelValidationContext$instance;
 
 export interface ClientValidatorCache$instance {
-    GetValidators(metadata: ModelMetadata, validatorProvider: IClientModelValidatorProvider): IReadOnlyList<IClientModelValidator>;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ClientValidatorCache: never;
+
+    GetValidators(metadata: ModelMetadata, validatorProvider: IClientModelValidatorProvider): IReadOnlyList_1<IClientModelValidator>;
 }
 
 
@@ -133,6 +139,8 @@ export const ClientValidatorCache: {
 export type ClientValidatorCache = ClientValidatorCache$instance;
 
 export interface ClientValidatorItem$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ClientValidatorItem: never;
+
     IsReusable: boolean;
     get Validator(): IClientModelValidator | undefined;
     set Validator(value: IClientModelValidator | undefined);
@@ -149,29 +157,33 @@ export const ClientValidatorItem: {
 export type ClientValidatorItem = ClientValidatorItem$instance;
 
 export interface ClientValidatorProviderContext$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ClientValidatorProviderContext: never;
+
     readonly ModelMetadata: ModelMetadata;
-    readonly Results: IList<ClientValidatorItem>;
-    readonly ValidatorMetadata: IReadOnlyList<unknown>;
+    readonly Results: IList_1<ClientValidatorItem>;
+    readonly ValidatorMetadata: IReadOnlyList_1<unknown>;
 }
 
 
 export const ClientValidatorProviderContext: {
-    new(modelMetadata: ModelMetadata, items: IList<ClientValidatorItem>): ClientValidatorProviderContext;
+    new(modelMetadata: ModelMetadata, items: IList_1<ClientValidatorItem>): ClientValidatorProviderContext;
 };
 
 
 export type ClientValidatorProviderContext = ClientValidatorProviderContext$instance;
 
-export interface CompositeClientModelValidatorProvider$instance {
+export interface CompositeClientModelValidatorProvider$instance extends IClientModelValidatorProvider$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_CompositeClientModelValidatorProvider: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IClientModelValidatorProvider: never;
 
-    readonly ValidatorProviders: IReadOnlyList<IClientModelValidatorProvider>;
+    readonly ValidatorProviders: IReadOnlyList_1<IClientModelValidatorProvider>;
     CreateValidators(context: ClientValidatorProviderContext): void;
 }
 
 
 export const CompositeClientModelValidatorProvider: {
-    new(providers: IEnumerable__System_Collections_Generic<IClientModelValidatorProvider>): CompositeClientModelValidatorProvider;
+    new(providers: IEnumerable_1<IClientModelValidatorProvider>): CompositeClientModelValidatorProvider;
 };
 
 
@@ -179,21 +191,21 @@ export interface __CompositeClientModelValidatorProvider$views {
     As_IClientModelValidatorProvider(): IClientModelValidatorProvider$instance;
 }
 
-export interface CompositeClientModelValidatorProvider$instance extends IClientModelValidatorProvider$instance {}
-
 export type CompositeClientModelValidatorProvider = CompositeClientModelValidatorProvider$instance & __CompositeClientModelValidatorProvider$views;
 
 
-export interface CompositeModelValidatorProvider$instance {
+export interface CompositeModelValidatorProvider$instance extends IModelValidatorProvider$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_CompositeModelValidatorProvider: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IModelValidatorProvider: never;
 
-    readonly ValidatorProviders: IList<IModelValidatorProvider>;
+    readonly ValidatorProviders: IList_1<IModelValidatorProvider>;
     CreateValidators(context: ModelValidatorProviderContext): void;
 }
 
 
 export const CompositeModelValidatorProvider: {
-    new(providers: IList<IModelValidatorProvider>): CompositeModelValidatorProvider;
+    new(providers: IList_1<IModelValidatorProvider>): CompositeModelValidatorProvider;
 };
 
 
@@ -201,12 +213,12 @@ export interface __CompositeModelValidatorProvider$views {
     As_IModelValidatorProvider(): IModelValidatorProvider$instance;
 }
 
-export interface CompositeModelValidatorProvider$instance extends IModelValidatorProvider$instance {}
-
 export type CompositeModelValidatorProvider = CompositeModelValidatorProvider$instance & __CompositeModelValidatorProvider$views;
 
 
 export interface ModelValidationContext$instance extends ModelValidationContextBase {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ModelValidationContext: never;
+
     readonly Container: unknown | undefined;
     readonly Model: unknown | undefined;
 }
@@ -220,6 +232,8 @@ export const ModelValidationContext: {
 export type ModelValidationContext = ModelValidationContext$instance;
 
 export interface ModelValidationContextBase$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ModelValidationContextBase: never;
+
     readonly ActionContext: ActionContext;
     readonly MetadataProvider: IModelMetadataProvider;
     readonly ModelMetadata: ModelMetadata;
@@ -234,6 +248,8 @@ export const ModelValidationContextBase: {
 export type ModelValidationContextBase = ModelValidationContextBase$instance;
 
 export interface ModelValidationResult$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ModelValidationResult: never;
+
     readonly MemberName: string;
     readonly Message: string;
 }
@@ -247,20 +263,24 @@ export const ModelValidationResult: {
 export type ModelValidationResult = ModelValidationResult$instance;
 
 export interface ModelValidatorProviderContext$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ModelValidatorProviderContext: never;
+
     ModelMetadata: ModelMetadata;
-    readonly Results: IList<ValidatorItem>;
-    readonly ValidatorMetadata: IReadOnlyList<unknown>;
+    readonly Results: IList_1<ValidatorItem>;
+    readonly ValidatorMetadata: IReadOnlyList_1<unknown>;
 }
 
 
 export const ModelValidatorProviderContext: {
-    new(modelMetadata: ModelMetadata, items: IList<ValidatorItem>): ModelValidatorProviderContext;
+    new(modelMetadata: ModelMetadata, items: IList_1<ValidatorItem>): ModelValidatorProviderContext;
 };
 
 
 export type ModelValidatorProviderContext = ModelValidatorProviderContext$instance;
 
-export interface ValidateNeverAttribute$instance extends Attribute {
+export interface ValidateNeverAttribute$instance extends Attribute, IPropertyValidationFilter$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidateNeverAttribute: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_IPropertyValidationFilter: never;
 
     ShouldValidateEntry(entry: ValidationEntry, parentEntry: ValidationEntry): boolean;
@@ -276,12 +296,12 @@ export interface __ValidateNeverAttribute$views {
     As_IPropertyValidationFilter(): IPropertyValidationFilter$instance;
 }
 
-export interface ValidateNeverAttribute$instance extends IPropertyValidationFilter$instance {}
-
 export type ValidateNeverAttribute = ValidateNeverAttribute$instance & __ValidateNeverAttribute$views;
 
 
 export interface ValidationStateDictionary$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidationStateDictionary: never;
+
     readonly __tsonic_iface_System_Collections_Generic_ICollection_1: never;
     readonly __tsonic_iface_System_Collections_Generic_IDictionary_2: never;
     readonly __tsonic_iface_System_Collections_Generic_IEnumerable_1: never;
@@ -293,16 +313,16 @@ export interface ValidationStateDictionary$instance {
     readonly IsReadOnly: boolean;
     get Item(): ValidationStateEntry | undefined;
     set Item(value: ValidationStateEntry | undefined);
-    readonly Keys: ICollection<unknown>;
-    readonly Values: ICollection<ValidationStateEntry>;
-    Add(item: KeyValuePair<unknown, ValidationStateEntry>): void;
+    readonly Keys: ICollection_1<unknown>;
+    readonly Values: ICollection_1<ValidationStateEntry>;
+    Add(item: KeyValuePair_2<unknown, ValidationStateEntry>): void;
     Add(key: unknown, value: ValidationStateEntry): void;
     Clear(): void;
-    Contains(item: KeyValuePair<unknown, ValidationStateEntry>): boolean;
+    Contains(item: KeyValuePair_2<unknown, ValidationStateEntry>): boolean;
     ContainsKey(key: unknown): boolean;
-    CopyTo(array: KeyValuePair<unknown, ValidationStateEntry>[], arrayIndex: int): void;
-    GetEnumerator(): IEnumerator<KeyValuePair<unknown, ValidationStateEntry>>;
-    Remove(item: KeyValuePair<unknown, ValidationStateEntry>): boolean;
+    CopyTo(array: KeyValuePair_2<unknown, ValidationStateEntry>[], arrayIndex: int): void;
+    GetEnumerator(): IEnumerator_1<KeyValuePair_2<unknown, ValidationStateEntry>>;
+    Remove(item: KeyValuePair_2<unknown, ValidationStateEntry>): boolean;
     Remove(key: unknown): boolean;
     TryGetValue(key: unknown, value: ValidationStateEntry): boolean;
 }
@@ -316,6 +336,8 @@ export const ValidationStateDictionary: {
 export type ValidationStateDictionary = ValidationStateDictionary$instance;
 
 export interface ValidationStateEntry$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidationStateEntry: never;
+
     Key: string;
     Metadata: ModelMetadata;
     Strategy: IValidationStrategy;
@@ -331,7 +353,9 @@ export const ValidationStateEntry: {
 export type ValidationStateEntry = ValidationStateEntry$instance;
 
 export interface ValidationVisitor$instance {
-    MaxValidationDepth: Nullable<System_Internal.Int32>;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidationVisitor: never;
+
+    MaxValidationDepth: Nullable_1<System_Internal.Int32>;
     ValidateComplexTypesIfChildValidationFails: boolean;
     GetValidationEntry(model: unknown): ValidationStateEntry | undefined;
     SuppressValidation(key: string): void;
@@ -354,7 +378,9 @@ export const ValidationVisitor: {
 export type ValidationVisitor = ValidationVisitor$instance;
 
 export interface ValidatorCache$instance {
-    GetValidators(metadata: ModelMetadata, validatorProvider: IModelValidatorProvider): IReadOnlyList<IModelValidator>;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidatorCache: never;
+
+    GetValidators(metadata: ModelMetadata, validatorProvider: IModelValidatorProvider): IReadOnlyList_1<IModelValidator>;
 }
 
 
@@ -366,6 +392,8 @@ export const ValidatorCache: {
 export type ValidatorCache = ValidatorCache$instance;
 
 export interface ValidatorItem$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_ModelBinding_Validation_ValidatorItem: never;
+
     IsReusable: boolean;
     get Validator(): IModelValidator | undefined;
     set Validator(value: IModelValidator | undefined);
@@ -382,8 +410,8 @@ export const ValidatorItem: {
 export type ValidatorItem = ValidatorItem$instance;
 
 export abstract class ModelValidatorProviderExtensions$instance {
-    static RemoveType(list: IList<IModelValidatorProvider>, type: Type): void;
-    static RemoveType<TModelValidatorProvider extends IModelValidatorProvider>(list: IList<IModelValidatorProvider>): void;
+    static RemoveType(list: IList_1<IModelValidatorProvider>, type: Type): void;
+    static RemoveType<TModelValidatorProvider extends IModelValidatorProvider>(list: IList_1<IModelValidatorProvider>): void;
 }
 
 

package/Microsoft.AspNetCore.Mvc.Razor/internal/index.d.ts

@@ -19,19 +19,19 @@ import type { IModelExpressionProvider, ITempDataDictionary, ViewDataDictionary_
 import type { ActionContext } from "../../Microsoft.AspNetCore.Mvc/internal/index.js";
 import type { TagHelperExecutionContext } from "../../Microsoft.AspNetCore.Razor.Runtime.TagHelpers/internal/index.js";
 import type { HtmlAttributeValueStyle, ITagHelper, TagHelperContent } from "../../Microsoft.AspNetCore.Razor.TagHelpers/internal/index.js";
-import type { IDictionary, IEnumerable, IList, IReadOnlyList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { DiagnosticListener, DiagnosticSource } from "@tsonic/dotnet/System.Diagnostics.js";
-import type { TextWriter } from "@tsonic/dotnet/System.IO.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, AsyncCallback, Boolean as ClrBoolean, Enum, Func, IAsyncResult, ICloneable, IComparable, IConvertible, IFormattable, Int32, IntPtr, ISpanFormattable, MulticastDelegate, Object as ClrObject, String as ClrString, ValueType, Void } from "@tsonic/dotnet/System.js";
-import * as System_Runtime_Serialization_Internal from "@tsonic/dotnet/System.Runtime.Serialization.js";
-import type { ISerializable } from "@tsonic/dotnet/System.Runtime.Serialization.js";
-import type { ClaimsPrincipal } from "@tsonic/dotnet/System.Security.Claims.js";
-import type { HtmlEncoder } from "@tsonic/dotnet/System.Text.Encodings.Web.js";
-import type { Task } from "@tsonic/dotnet/System.Threading.Tasks.js";
-import type { IMemoryCache } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Caching.Memory.js";
-import type { ILoggerFactory } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Logging.js";
-import type { IOptions } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Options.js";
+import type { IDictionary_2, IEnumerable_1, IList_1, IReadOnlyList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { DiagnosticListener, DiagnosticSource } from "@tsonic/dotnet/System.Diagnostics/internal/index.js";
+import type { TextWriter } from "@tsonic/dotnet/System.IO/internal/index.js";
+import * as System_Runtime_Serialization_Internal from "@tsonic/dotnet/System.Runtime.Serialization/internal/index.js";
+import type { ISerializable } from "@tsonic/dotnet/System.Runtime.Serialization/internal/index.js";
+import type { ClaimsPrincipal } from "@tsonic/dotnet/System.Security.Claims/internal/index.js";
+import type { HtmlEncoder } from "@tsonic/dotnet/System.Text.Encodings.Web/internal/index.js";
+import type { Task, Task_1 } from "@tsonic/dotnet/System.Threading.Tasks/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Action_2, AsyncCallback, Boolean as ClrBoolean, Enum, Func_1, Func_2, IAsyncResult, ICloneable, IComparable, IConvertible, IFormattable, Int32, IntPtr, ISpanFormattable, MulticastDelegate, Object as ClrObject, String as ClrString, ValueType, Void } from "@tsonic/dotnet/System/internal/index.js";
+import type { IMemoryCache } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Caching.Memory/internal/index.js";
+import type { ILoggerFactory } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Logging/internal/index.js";
+import type { IOptions_1 } from "@tsonic/microsoft-extensions/Microsoft.Extensions.Options/internal/index.js";
 
 export enum LanguageViewLocationExpanderFormat {
     SubFolder = 0,
@@ -52,8 +52,8 @@ export interface IRazorPage$instance {
     Path: string;
     get Layout(): string | undefined;
     set Layout(value: string | undefined);
-    PreviousSectionWriters: IDictionary<System_Internal.String, RenderAsyncDelegate>;
-    readonly SectionWriters: IDictionary<System_Internal.String, RenderAsyncDelegate>;
+    PreviousSectionWriters: IDictionary_2<System_Internal.String, RenderAsyncDelegate>;
+    readonly SectionWriters: IDictionary_2<System_Internal.String, RenderAsyncDelegate>;
     EnsureRenderedBodyOrSections(): void;
     ExecuteAsync(): Task;
 }
@@ -124,7 +124,7 @@ export type ITagHelperInitializer_1<TTagHelper extends ITagHelper> = ITagHelperI
 export interface IViewLocationExpander$instance {
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IViewLocationExpander: never;
 
-    ExpandViewLocations(context: ViewLocationExpanderContext, viewLocations: IEnumerable<System_Internal.String>): IEnumerable<System_Internal.String>;
+    ExpandViewLocations(context: ViewLocationExpanderContext, viewLocations: IEnumerable_1<System_Internal.String>): IEnumerable_1<System_Internal.String>;
     PopulateValues(context: ViewLocationExpanderContext): void;
 }
 
@@ -132,44 +132,50 @@ export interface IViewLocationExpander$instance {
 export type IViewLocationExpander = IViewLocationExpander$instance;
 
 export interface RazorPageFactoryResult$instance {
-    readonly RazorPageFactory: Func<IRazorPage> | undefined;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPageFactoryResult: never;
+
+    readonly RazorPageFactory: Func_1<IRazorPage> | undefined;
     readonly Success: boolean;
     readonly ViewDescriptor: CompiledViewDescriptor | undefined;
 }
 
 
 export const RazorPageFactoryResult: {
-    new(viewDescriptor: CompiledViewDescriptor, razorPageFactory: Func<IRazorPage>): RazorPageFactoryResult;
+    new(viewDescriptor: CompiledViewDescriptor, razorPageFactory: Func_1<IRazorPage>): RazorPageFactoryResult;
 };
 
 
 export type RazorPageFactoryResult = RazorPageFactoryResult$instance;
 
 export interface RazorPageResult$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPageResult: never;
+
     readonly Name: string;
     readonly Page: IRazorPage | undefined;
-    readonly SearchedLocations: IEnumerable<System_Internal.String> | undefined;
+    readonly SearchedLocations: IEnumerable_1<System_Internal.String> | undefined;
 }
 
 
 export const RazorPageResult: {
     new(name: string, page: IRazorPage): RazorPageResult;
-    new(name: string, searchedLocations: IEnumerable<System_Internal.String>): RazorPageResult;
+    new(name: string, searchedLocations: IEnumerable_1<System_Internal.String>): RazorPageResult;
 };
 
 
 export type RazorPageResult = RazorPageResult$instance;
 
-export interface HelperResult$instance {
+export interface HelperResult$instance extends Microsoft_AspNetCore_Html_Internal.IHtmlContent$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_HelperResult: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Html_IHtmlContent: never;
 
-    readonly WriteAction: Func<TextWriter, Task>;
+    readonly WriteAction: Func_2<TextWriter, Task>;
     WriteTo(writer: TextWriter, encoder: HtmlEncoder): void;
 }
 
 
 export const HelperResult: {
-    new(asyncAction: Func<TextWriter, Task>): HelperResult;
+    new(asyncAction: Func_2<TextWriter, Task>): HelperResult;
 };
 
 
@@ -177,15 +183,15 @@ export interface __HelperResult$views {
     As_IHtmlContent(): Microsoft_AspNetCore_Html_Internal.IHtmlContent$instance;
 }
 
-export interface HelperResult$instance extends Microsoft_AspNetCore_Html_Internal.IHtmlContent$instance {}
-
 export type HelperResult = HelperResult$instance & __HelperResult$views;
 
 
-export interface LanguageViewLocationExpander$instance {
+export interface LanguageViewLocationExpander$instance extends IViewLocationExpander$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_LanguageViewLocationExpander: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IViewLocationExpander: never;
 
-    ExpandViewLocations(context: ViewLocationExpanderContext, viewLocations: IEnumerable<System_Internal.String>): IEnumerable<System_Internal.String>;
+    ExpandViewLocations(context: ViewLocationExpanderContext, viewLocations: IEnumerable_1<System_Internal.String>): IEnumerable_1<System_Internal.String>;
     PopulateValues(context: ViewLocationExpanderContext): void;
 }
 
@@ -200,12 +206,12 @@ export interface __LanguageViewLocationExpander$views {
     As_IViewLocationExpander(): IViewLocationExpander$instance;
 }
 
-export interface LanguageViewLocationExpander$instance extends IViewLocationExpander$instance {}
-
 export type LanguageViewLocationExpander = LanguageViewLocationExpander$instance & __LanguageViewLocationExpander$views;
 
 
 export interface RazorPage$instance extends RazorPageBase$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPage: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IRazorPage: never;
 
     readonly Context: HttpContext;
@@ -220,8 +226,8 @@ export interface RazorPage$instance extends RazorPageBase$instance {
     RenderBody(): IHtmlContent;
     RenderSection(name: string): HtmlString | undefined;
     RenderSection(name: string, required: boolean): HtmlString | undefined;
-    RenderSectionAsync(name: string): Task<HtmlString | undefined>;
-    RenderSectionAsync(name: string, required: boolean): Task<HtmlString | undefined>;
+    RenderSectionAsync(name: string): Task_1<HtmlString | undefined>;
+    RenderSectionAsync(name: string, required: boolean): Task_1<HtmlString | undefined>;
 }
 
 
@@ -237,6 +243,8 @@ export type RazorPage = RazorPage$instance & __RazorPage$views;
 
 
 export interface RazorPage_1$instance<TModel> extends RazorPage$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPage_1: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IRazorPage: never;
 
     readonly Model: TModel;
@@ -257,7 +265,9 @@ export interface __RazorPage_1$views<TModel> {
 export type RazorPage_1<TModel> = RazorPage_1$instance<TModel> & __RazorPage_1$views<TModel>;
 
 
-export interface RazorPageActivator$instance {
+export interface RazorPageActivator$instance extends IRazorPageActivator$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPageActivator: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IRazorPageActivator: never;
 
     Activate(page: IRazorPage, context: ViewContext): void;
@@ -273,12 +283,12 @@ export interface __RazorPageActivator$views {
     As_IRazorPageActivator(): IRazorPageActivator$instance;
 }
 
-export interface RazorPageActivator$instance extends IRazorPageActivator$instance {}
-
 export type RazorPageActivator = RazorPageActivator$instance & __RazorPageActivator$views;
 
 
-export interface RazorPageBase$instance {
+export interface RazorPageBase$instance extends IRazorPage$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorPageBase: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IRazorPage: never;
 
     get BodyContent(): IHtmlContent | undefined;
@@ -290,8 +300,8 @@ export interface RazorPageBase$instance {
     set Layout(value: string | undefined);
     readonly Output: TextWriter;
     Path: string;
-    PreviousSectionWriters: IDictionary<System_Internal.String, RenderAsyncDelegate>;
-    readonly SectionWriters: IDictionary<System_Internal.String, RenderAsyncDelegate>;
+    PreviousSectionWriters: IDictionary_2<System_Internal.String, RenderAsyncDelegate>;
+    readonly SectionWriters: IDictionary_2<System_Internal.String, RenderAsyncDelegate>;
     readonly TempData: ITempDataDictionary;
     readonly User: ClaimsPrincipal;
     readonly ViewBag: unknown;
@@ -310,7 +320,7 @@ export interface RazorPageBase$instance {
     EndWriteTagHelperAttribute(): string;
     EnsureRenderedBodyOrSections(): void;
     ExecuteAsync(): Task;
-    FlushAsync(): Task<HtmlString>;
+    FlushAsync(): Task_1<HtmlString>;
     Href(contentPath: string): string;
     InvalidTagHelperIndexerAssignment(attributeName: string, tagHelperTypeName: string, propertyName: string): string;
     PopWriter(): TextWriter;
@@ -333,23 +343,23 @@ export interface __RazorPageBase$views {
     As_IRazorPage(): IRazorPage$instance;
 }
 
-export interface RazorPageBase$instance extends IRazorPage$instance {}
-
 export type RazorPageBase = RazorPageBase$instance & __RazorPageBase$views;
 
 
-export interface RazorView$instance {
+export interface RazorView$instance extends Microsoft_AspNetCore_Mvc_ViewEngines_Internal.IView$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorView: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ViewEngines_IView: never;
 
     readonly Path: string;
     readonly RazorPage: IRazorPage;
-    readonly ViewStartPages: IReadOnlyList<IRazorPage>;
+    readonly ViewStartPages: IReadOnlyList_1<IRazorPage>;
     RenderAsync(context: ViewContext): Task;
 }
 
 
 export const RazorView: {
-    new(viewEngine: IRazorViewEngine, pageActivator: IRazorPageActivator, viewStartPages: IReadOnlyList<IRazorPage>, razorPage: IRazorPage, htmlEncoder: HtmlEncoder, diagnosticListener: DiagnosticListener): RazorView;
+    new(viewEngine: IRazorViewEngine, pageActivator: IRazorPageActivator, viewStartPages: IReadOnlyList_1<IRazorPage>, razorPage: IRazorPage, htmlEncoder: HtmlEncoder, diagnosticListener: DiagnosticListener): RazorView;
 };
 
 
@@ -357,12 +367,12 @@ export interface __RazorView$views {
     As_IView(): Microsoft_AspNetCore_Mvc_ViewEngines_Internal.IView$instance;
 }
 
-export interface RazorView$instance extends Microsoft_AspNetCore_Mvc_ViewEngines_Internal.IView$instance {}
-
 export type RazorView = RazorView$instance & __RazorView$views;
 
 
 export interface RazorViewEngine$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorViewEngine: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_IRazorViewEngine: never;
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_ViewEngines_IViewEngine: never;
 
@@ -375,7 +385,7 @@ export interface RazorViewEngine$instance {
 
 
 export const RazorViewEngine: {
-    new(pageFactory: IRazorPageFactoryProvider, pageActivator: IRazorPageActivator, htmlEncoder: HtmlEncoder, optionsAccessor: IOptions<RazorViewEngineOptions>, loggerFactory: ILoggerFactory, diagnosticListener: DiagnosticListener): RazorViewEngine;
+    new(pageFactory: IRazorPageFactoryProvider, pageActivator: IRazorPageActivator, htmlEncoder: HtmlEncoder, optionsAccessor: IOptions_1<RazorViewEngineOptions>, loggerFactory: ILoggerFactory, diagnosticListener: DiagnosticListener): RazorViewEngine;
     readonly ViewExtension: string;
     GetNormalizedRouteValue(context: ActionContext, key: string): string | undefined;
 };
@@ -390,11 +400,13 @@ export type RazorViewEngine = RazorViewEngine$instance & __RazorViewEngine$views
 
 
 export interface RazorViewEngineOptions$instance {
-    readonly AreaPageViewLocationFormats: IList<System_Internal.String>;
-    readonly AreaViewLocationFormats: IList<System_Internal.String>;
-    readonly PageViewLocationFormats: IList<System_Internal.String>;
-    readonly ViewLocationExpanders: IList<IViewLocationExpander>;
-    readonly ViewLocationFormats: IList<System_Internal.String>;
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_RazorViewEngineOptions: never;
+
+    readonly AreaPageViewLocationFormats: IList_1<System_Internal.String>;
+    readonly AreaViewLocationFormats: IList_1<System_Internal.String>;
+    readonly PageViewLocationFormats: IList_1<System_Internal.String>;
+    readonly ViewLocationExpanders: IList_1<IViewLocationExpander>;
+    readonly ViewLocationFormats: IList_1<System_Internal.String>;
 }
 
 
@@ -405,7 +417,9 @@ export const RazorViewEngineOptions: {
 
 export type RazorViewEngineOptions = RazorViewEngineOptions$instance;
 
-export interface TagHelperInitializer_1$instance<TTagHelper extends ITagHelper> {
+export interface TagHelperInitializer_1$instance<TTagHelper extends ITagHelper> extends ITagHelperInitializer_1$instance<TTagHelper> {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_TagHelperInitializer_1: never;
+
     readonly __tsonic_iface_Microsoft_AspNetCore_Mvc_Razor_ITagHelperInitializer_1: never;
 
     Initialize(helper: TTagHelper, context: ViewContext): void;
@@ -413,7 +427,7 @@ export interface TagHelperInitializer_1$instance<TTagHelper extends ITagHelper>
 
 
 export const TagHelperInitializer_1: {
-    new<TTagHelper extends ITagHelper>(action: Action<TTagHelper, ViewContext>): TagHelperInitializer_1<TTagHelper>;
+    new<TTagHelper extends ITagHelper>(action: Action_2<TTagHelper, ViewContext>): TagHelperInitializer_1<TTagHelper>;
 };
 
 
@@ -421,18 +435,18 @@ export interface __TagHelperInitializer_1$views<TTagHelper extends ITagHelper> {
     As_ITagHelperInitializer_1(): ITagHelperInitializer_1$instance<TTagHelper>;
 }
 
-export interface TagHelperInitializer_1$instance<TTagHelper extends ITagHelper> extends ITagHelperInitializer_1$instance<TTagHelper> {}
-
 export type TagHelperInitializer_1<TTagHelper extends ITagHelper> = TagHelperInitializer_1$instance<TTagHelper> & __TagHelperInitializer_1$views<TTagHelper>;
 
 
 export interface ViewLocationExpanderContext$instance {
+    readonly __tsonic_type_Microsoft_AspNetCore_Mvc_Razor_ViewLocationExpanderContext: never;
+
     readonly ActionContext: ActionContext;
     readonly AreaName: string | undefined;
     readonly ControllerName: string | undefined;
     readonly IsMainPage: boolean;
     readonly PageName: string | undefined;
-    Values: IDictionary<System_Internal.String, string | undefined>;
+    Values: IDictionary_2<System_Internal.String, string | undefined>;
     readonly ViewName: string;
 }