@tsonic/microsoft-extensions 10.0.5 → 10.0.7

package/Microsoft.Extensions.Hosting/internal/index.d.ts

@@ -11,13 +11,13 @@ import type { IServiceCollection, IServiceProviderFactory_1, ServiceProviderOpti
 import type { IMetricsBuilder } from "../../Microsoft.Extensions.Diagnostics.Metrics/internal/index.js";
 import type { IFileProvider } from "../../Microsoft.Extensions.FileProviders/internal/index.js";
 import type { ILoggingBuilder } from "../../Microsoft.Extensions.Logging/internal/index.js";
-import type { IDictionary } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, Boolean as ClrBoolean, Enum, Exception, Func, IComparable, IConvertible, IDisposable, IFormattable, Int32, IServiceProvider, ISpanFormattable, Object as ClrObject, String as ClrString, TimeSpan, 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 { CancellationToken } from "@tsonic/dotnet/System.Threading.js";
-import type { Task } from "@tsonic/dotnet/System.Threading.Tasks.js";
+import type { IDictionary_2 } from "@tsonic/dotnet/System.Collections.Generic/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 { 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_1, Action_2, Boolean as ClrBoolean, Enum, Exception, Func_2, IComparable, IConvertible, IDisposable, IFormattable, Int32, IServiceProvider, ISpanFormattable, Object as ClrObject, String as ClrString, TimeSpan, Void } from "@tsonic/dotnet/System/internal/index.js";
 
 export enum BackgroundServiceExceptionBehavior {
     StopHost = 0,
@@ -52,13 +52,13 @@ export type IHost = IHost$instance;
 export interface IHostApplicationBuilder$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostApplicationBuilder: never;
 
-    readonly Properties: IDictionary<unknown, unknown>;
+    readonly Properties: IDictionary_2<unknown, unknown>;
     readonly Configuration: IConfigurationManager;
     readonly Environment: IHostEnvironment;
     readonly Logging: ILoggingBuilder;
     readonly Metrics: IMetricsBuilder;
     readonly Services: IServiceCollection;
-    ConfigureContainer<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>, configure?: Action<TContainerBuilder>): void;
+    ConfigureContainer<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>, configure?: Action_1<TContainerBuilder>): void;
 }
 
 
@@ -79,11 +79,11 @@ export type IHostApplicationLifetime = IHostApplicationLifetime$instance;
 export interface IHostBuilder$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostBuilder: never;
 
-    readonly Properties: IDictionary<unknown, unknown>;
+    readonly Properties: IDictionary_2<unknown, unknown>;
     Build(): IHost;
-    ConfigureAppConfiguration(configureDelegate: Action<HostBuilderContext, IConfigurationBuilder>): IHostBuilder;
-    ConfigureHostConfiguration(configureDelegate: Action<IConfigurationBuilder>): IHostBuilder;
-    UseServiceProviderFactory<TContainerBuilder>(factory: Func<HostBuilderContext, IServiceProviderFactory_1<TContainerBuilder>>): IHostBuilder;
+    ConfigureAppConfiguration(configureDelegate: Action_2<HostBuilderContext, IConfigurationBuilder>): IHostBuilder;
+    ConfigureHostConfiguration(configureDelegate: Action_1<IConfigurationBuilder>): IHostBuilder;
+    UseServiceProviderFactory<TContainerBuilder>(factory: Func_2<HostBuilderContext, IServiceProviderFactory_1<TContainerBuilder>>): IHostBuilder;
     UseServiceProviderFactory<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>): IHostBuilder;
 }
 
@@ -144,7 +144,9 @@ export interface IHostLifetime$instance {
 
 export type IHostLifetime = IHostLifetime$instance;
 
-export interface BackgroundService$instance {
+export interface BackgroundService$instance extends IHostedService$instance, System_Internal.IDisposable {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_BackgroundService: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostedService: never;
     readonly __tsonic_iface_System_IDisposable: never;
 
@@ -164,12 +166,12 @@ export interface __BackgroundService$views {
     As_IHostedService(): IHostedService$instance;
 }
 
-export interface BackgroundService$instance extends IHostedService$instance, System_Internal.IDisposable {}
-
 export type BackgroundService = BackgroundService$instance & __BackgroundService$views;
 
 
 export interface ConsoleLifetimeOptions$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_ConsoleLifetimeOptions: never;
+
     SuppressStatusMessages: boolean;
 }
 
@@ -182,6 +184,8 @@ export const ConsoleLifetimeOptions: {
 export type ConsoleLifetimeOptions = ConsoleLifetimeOptions$instance;
 
 export interface HostAbortedException$instance extends Exception {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostAbortedException: never;
+
     readonly __tsonic_iface_System_Runtime_Serialization_ISerializable: never;
 
 }
@@ -197,6 +201,8 @@ export const HostAbortedException: {
 export type HostAbortedException = HostAbortedException$instance;
 
 export interface HostApplicationBuilder$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostApplicationBuilder: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostApplicationBuilder: never;
 
     readonly Configuration: ConfigurationManager;
@@ -205,7 +211,7 @@ export interface HostApplicationBuilder$instance {
     readonly Metrics: IMetricsBuilder;
     readonly Services: IServiceCollection;
     Build(): IHost;
-    ConfigureContainer<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>, configure?: Action<TContainerBuilder>): void;
+    ConfigureContainer<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>, configure?: Action_1<TContainerBuilder>): void;
 }
 
 
@@ -224,6 +230,8 @@ export type HostApplicationBuilder = HostApplicationBuilder$instance & __HostApp
 
 
 export interface HostApplicationBuilderSettings$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostApplicationBuilderSettings: never;
+
     get ApplicationName(): string | undefined;
     set ApplicationName(value: string | undefined);
     get Args(): string[] | undefined;
@@ -246,16 +254,18 @@ export const HostApplicationBuilderSettings: {
 export type HostApplicationBuilderSettings = HostApplicationBuilderSettings$instance;
 
 export interface HostBuilder$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostBuilder: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostBuilder: never;
 
-    readonly Properties: IDictionary<unknown, unknown>;
+    readonly Properties: IDictionary_2<unknown, unknown>;
     Build(): IHost;
-    ConfigureAppConfiguration(configureDelegate: Action<HostBuilderContext, IConfigurationBuilder>): IHostBuilder;
-    ConfigureContainer<TContainerBuilder>(configureDelegate: Action<HostBuilderContext, TContainerBuilder>): IHostBuilder;
-    ConfigureHostConfiguration(configureDelegate: Action<IConfigurationBuilder>): IHostBuilder;
-    ConfigureServices(configureDelegate: Action<HostBuilderContext, IServiceCollection>): IHostBuilder;
+    ConfigureAppConfiguration(configureDelegate: Action_2<HostBuilderContext, IConfigurationBuilder>): IHostBuilder;
+    ConfigureContainer<TContainerBuilder>(configureDelegate: Action_2<HostBuilderContext, TContainerBuilder>): IHostBuilder;
+    ConfigureHostConfiguration(configureDelegate: Action_1<IConfigurationBuilder>): IHostBuilder;
+    ConfigureServices(configureDelegate: Action_2<HostBuilderContext, IServiceCollection>): IHostBuilder;
     UseServiceProviderFactory<TContainerBuilder>(factory: IServiceProviderFactory_1<TContainerBuilder>): IHostBuilder;
-    UseServiceProviderFactory<TContainerBuilder>(factory: Func<HostBuilderContext, IServiceProviderFactory_1<TContainerBuilder>>): IHostBuilder;
+    UseServiceProviderFactory<TContainerBuilder>(factory: Func_2<HostBuilderContext, IServiceProviderFactory_1<TContainerBuilder>>): IHostBuilder;
 }
 
 
@@ -272,20 +282,24 @@ export type HostBuilder = HostBuilder$instance & __HostBuilder$views;
 
 
 export interface HostBuilderContext$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostBuilderContext: never;
+
     Configuration: IConfiguration;
     HostingEnvironment: IHostEnvironment;
-    readonly Properties: IDictionary<unknown, unknown>;
+    readonly Properties: IDictionary_2<unknown, unknown>;
 }
 
 
 export const HostBuilderContext: {
-    new(properties: IDictionary<unknown, unknown>): HostBuilderContext;
+    new(properties: IDictionary_2<unknown, unknown>): HostBuilderContext;
 };
 
 
 export type HostBuilderContext = HostBuilderContext$instance;
 
 export interface HostOptions$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_HostOptions: never;
+
     BackgroundServiceExceptionBehavior: BackgroundServiceExceptionBehavior;
     ServicesStartConcurrently: boolean;
     ServicesStopConcurrently: boolean;
@@ -352,7 +366,7 @@ export type HostEnvironmentEnvExtensions = HostEnvironmentEnvExtensions$instance
 
 export abstract class HostingAbstractionsHostBuilderExtensions$instance {
     static Start(hostBuilder: IHostBuilder): IHost;
-    static StartAsync(hostBuilder: IHostBuilder, cancellationToken?: CancellationToken): Task<IHost>;
+    static StartAsync(hostBuilder: IHostBuilder, cancellationToken?: CancellationToken): Task_1<IHost>;
 }
 
 
@@ -381,23 +395,23 @@ export abstract class HostingEnvironmentExtensions$instance {
 export type HostingEnvironmentExtensions = HostingEnvironmentExtensions$instance;
 
 export abstract class HostingHostBuilderExtensions$instance {
-    static ConfigureAppConfiguration(hostBuilder: IHostBuilder, configureDelegate: Action<IConfigurationBuilder>): IHostBuilder;
-    static ConfigureContainer<TContainerBuilder>(hostBuilder: IHostBuilder, configureDelegate: Action<TContainerBuilder>): IHostBuilder;
+    static ConfigureAppConfiguration(hostBuilder: IHostBuilder, configureDelegate: Action_1<IConfigurationBuilder>): IHostBuilder;
+    static ConfigureContainer<TContainerBuilder>(hostBuilder: IHostBuilder, configureDelegate: Action_1<TContainerBuilder>): IHostBuilder;
     static ConfigureDefaults(builder: IHostBuilder, args: string[]): IHostBuilder;
-    static ConfigureHostOptions(hostBuilder: IHostBuilder, configureOptions: Action<HostOptions>): IHostBuilder;
-    static ConfigureHostOptions(hostBuilder: IHostBuilder, configureOptions: Action<HostBuilderContext, HostOptions>): IHostBuilder;
-    static ConfigureLogging(hostBuilder: IHostBuilder, configureLogging: Action<ILoggingBuilder>): IHostBuilder;
-    static ConfigureLogging(hostBuilder: IHostBuilder, configureLogging: Action<HostBuilderContext, ILoggingBuilder>): IHostBuilder;
-    static ConfigureMetrics(hostBuilder: IHostBuilder, configureMetrics: Action<IMetricsBuilder>): IHostBuilder;
-    static ConfigureMetrics(hostBuilder: IHostBuilder, configureMetrics: Action<HostBuilderContext, IMetricsBuilder>): IHostBuilder;
-    static ConfigureServices(hostBuilder: IHostBuilder, configureDelegate: Action<IServiceCollection>): IHostBuilder;
-    static RunConsoleAsync(hostBuilder: IHostBuilder, configureOptions: Action<ConsoleLifetimeOptions>, cancellationToken?: CancellationToken): Task;
+    static ConfigureHostOptions(hostBuilder: IHostBuilder, configureOptions: Action_1<HostOptions>): IHostBuilder;
+    static ConfigureHostOptions(hostBuilder: IHostBuilder, configureOptions: Action_2<HostBuilderContext, HostOptions>): IHostBuilder;
+    static ConfigureLogging(hostBuilder: IHostBuilder, configureLogging: Action_1<ILoggingBuilder>): IHostBuilder;
+    static ConfigureLogging(hostBuilder: IHostBuilder, configureLogging: Action_2<HostBuilderContext, ILoggingBuilder>): IHostBuilder;
+    static ConfigureMetrics(hostBuilder: IHostBuilder, configureMetrics: Action_1<IMetricsBuilder>): IHostBuilder;
+    static ConfigureMetrics(hostBuilder: IHostBuilder, configureMetrics: Action_2<HostBuilderContext, IMetricsBuilder>): IHostBuilder;
+    static ConfigureServices(hostBuilder: IHostBuilder, configureDelegate: Action_1<IServiceCollection>): IHostBuilder;
+    static RunConsoleAsync(hostBuilder: IHostBuilder, configureOptions: Action_1<ConsoleLifetimeOptions>, cancellationToken?: CancellationToken): Task;
     static RunConsoleAsync(hostBuilder: IHostBuilder, cancellationToken?: CancellationToken): Task;
-    static UseConsoleLifetime(hostBuilder: IHostBuilder, configureOptions: Action<ConsoleLifetimeOptions>): IHostBuilder;
+    static UseConsoleLifetime(hostBuilder: IHostBuilder, configureOptions: Action_1<ConsoleLifetimeOptions>): IHostBuilder;
     static UseConsoleLifetime(hostBuilder: IHostBuilder): IHostBuilder;
     static UseContentRoot(hostBuilder: IHostBuilder, contentRoot: string): IHostBuilder;
-    static UseDefaultServiceProvider(hostBuilder: IHostBuilder, configure: Action<ServiceProviderOptions>): IHostBuilder;
-    static UseDefaultServiceProvider(hostBuilder: IHostBuilder, configure: Action<HostBuilderContext, ServiceProviderOptions>): IHostBuilder;
+    static UseDefaultServiceProvider(hostBuilder: IHostBuilder, configure: Action_1<ServiceProviderOptions>): IHostBuilder;
+    static UseDefaultServiceProvider(hostBuilder: IHostBuilder, configure: Action_2<HostBuilderContext, ServiceProviderOptions>): IHostBuilder;
     static UseEnvironment(hostBuilder: IHostBuilder, environment: string): IHostBuilder;
 }
 

package/Microsoft.Extensions.Hosting.Internal/internal/index.d.ts

@@ -11,12 +11,14 @@ import * as Microsoft_Extensions_Hosting_Internal from "../../Microsoft.Extensio
 import type { ConsoleLifetimeOptions, HostOptions, IApplicationLifetime, IHostApplicationLifetime, IHostEnvironment, IHostingEnvironment, IHostLifetime } from "../../Microsoft.Extensions.Hosting/internal/index.js";
 import type { ILogger_1, ILoggerFactory } from "../../Microsoft.Extensions.Logging/internal/index.js";
 import type { IOptions_1 } from "../../Microsoft.Extensions.Options/internal/index.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { IDisposable, Object as ClrObject, String as ClrString, Void } from "@tsonic/dotnet/System.js";
-import type { CancellationToken } from "@tsonic/dotnet/System.Threading.js";
-import type { Task } from "@tsonic/dotnet/System.Threading.Tasks.js";
+import type { Task } 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 { IDisposable, Object as ClrObject, String as ClrString, Void } from "@tsonic/dotnet/System/internal/index.js";
+
+export interface ApplicationLifetime$instance extends Microsoft_Extensions_Hosting_Internal.IApplicationLifetime$instance, Microsoft_Extensions_Hosting_Internal.IHostApplicationLifetime$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_Internal_ApplicationLifetime: never;
 
-export interface ApplicationLifetime$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IApplicationLifetime: never;
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostApplicationLifetime: never;
 
@@ -39,12 +41,12 @@ export interface __ApplicationLifetime$views {
     As_IHostApplicationLifetime(): Microsoft_Extensions_Hosting_Internal.IHostApplicationLifetime$instance;
 }
 
-export interface ApplicationLifetime$instance extends Microsoft_Extensions_Hosting_Internal.IApplicationLifetime$instance, Microsoft_Extensions_Hosting_Internal.IHostApplicationLifetime$instance {}
-
 export type ApplicationLifetime = ApplicationLifetime$instance & __ApplicationLifetime$views;
 
 
-export interface ConsoleLifetime$instance {
+export interface ConsoleLifetime$instance extends Microsoft_Extensions_Hosting_Internal.IHostLifetime$instance, System_Internal.IDisposable {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_Internal_ConsoleLifetime: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostLifetime: never;
     readonly __tsonic_iface_System_IDisposable: never;
 
@@ -64,12 +66,12 @@ export interface __ConsoleLifetime$views {
     As_IHostLifetime(): Microsoft_Extensions_Hosting_Internal.IHostLifetime$instance;
 }
 
-export interface ConsoleLifetime$instance extends Microsoft_Extensions_Hosting_Internal.IHostLifetime$instance, System_Internal.IDisposable {}
-
 export type ConsoleLifetime = ConsoleLifetime$instance & __ConsoleLifetime$views;
 
 
-export interface HostingEnvironment$instance {
+export interface HostingEnvironment$instance extends Microsoft_Extensions_Hosting_Internal.IHostEnvironment$instance, Microsoft_Extensions_Hosting_Internal.IHostingEnvironment$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Hosting_Internal_HostingEnvironment: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostEnvironment: never;
     readonly __tsonic_iface_Microsoft_Extensions_Hosting_IHostingEnvironment: never;
 
@@ -90,8 +92,6 @@ export interface __HostingEnvironment$views {
     As_IHostingEnvironment(): Microsoft_Extensions_Hosting_Internal.IHostingEnvironment$instance;
 }
 
-export interface HostingEnvironment$instance extends Microsoft_Extensions_Hosting_Internal.IHostEnvironment$instance, Microsoft_Extensions_Hosting_Internal.IHostingEnvironment$instance {}
-
 export type HostingEnvironment = HostingEnvironment$instance & __HostingEnvironment$views;
 
 

package/Microsoft.Extensions.Http/internal/index.d.ts

@@ -6,15 +6,15 @@
 import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
 
 // Import types from other namespaces
-import type { IEnumerable, IList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Action, Boolean as ClrBoolean, Func, IServiceProvider, Object as ClrObject, String as ClrString, TimeSpan } from "@tsonic/dotnet/System.js";
-import type { DelegatingHandler, HttpClient, HttpMessageHandler } from "@tsonic/dotnet/System.Net.Http.js";
+import type { IEnumerable_1, IList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { DelegatingHandler, HttpClient, HttpMessageHandler } from "@tsonic/dotnet/System.Net.Http/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Action_1, Boolean as ClrBoolean, Func_2, IServiceProvider, Object as ClrObject, String as ClrString, TimeSpan } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface IHttpMessageHandlerBuilderFilter$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Http_IHttpMessageHandlerBuilderFilter: never;
 
-    Configure(next: Action<HttpMessageHandlerBuilder>): Action<HttpMessageHandlerBuilder>;
+    Configure(next: Action_1<HttpMessageHandlerBuilder>): Action_1<HttpMessageHandlerBuilder>;
 }
 
 
@@ -30,10 +30,12 @@ export interface ITypedHttpClientFactory_1$instance<TClient> {
 export type ITypedHttpClientFactory_1<TClient> = ITypedHttpClientFactory_1$instance<TClient>;
 
 export interface HttpClientFactoryOptions$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Http_HttpClientFactoryOptions: never;
+
     HandlerLifetime: TimeSpan;
-    readonly HttpClientActions: IList<Action<HttpClient>>;
-    readonly HttpMessageHandlerBuilderActions: IList<Action<HttpMessageHandlerBuilder>>;
-    ShouldRedactHeaderValue: Func<System_Internal.String, System_Internal.Boolean>;
+    readonly HttpClientActions: IList_1<Action_1<HttpClient>>;
+    readonly HttpMessageHandlerBuilderActions: IList_1<Action_1<HttpMessageHandlerBuilder>>;
+    ShouldRedactHeaderValue: Func_2<System_Internal.String, System_Internal.Boolean>;
     SuppressHandlerScope: boolean;
 }
 
@@ -46,7 +48,9 @@ export const HttpClientFactoryOptions: {
 export type HttpClientFactoryOptions = HttpClientFactoryOptions$instance;
 
 export interface HttpMessageHandlerBuilder$instance {
-    readonly AdditionalHandlers: IList<DelegatingHandler>;
+    readonly __tsonic_type_Microsoft_Extensions_Http_HttpMessageHandlerBuilder: never;
+
+    readonly AdditionalHandlers: IList_1<DelegatingHandler>;
     get Name(): string | undefined;
     set Name(value: string | undefined);
     PrimaryHandler: HttpMessageHandler;
@@ -56,7 +60,7 @@ export interface HttpMessageHandlerBuilder$instance {
 
 
 export const HttpMessageHandlerBuilder: (abstract new() => HttpMessageHandlerBuilder) & {
-    CreateHandlerPipeline(primaryHandler: HttpMessageHandler, additionalHandlers: IEnumerable<DelegatingHandler>): HttpMessageHandler;
+    CreateHandlerPipeline(primaryHandler: HttpMessageHandler, additionalHandlers: IEnumerable_1<DelegatingHandler>): HttpMessageHandler;
 };
 
 

package/Microsoft.Extensions.Http.Logging/internal/index.d.ts

@@ -8,12 +8,12 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 // Import types from other namespaces
 import type { HttpClientFactoryOptions } from "../../Microsoft.Extensions.Http/internal/index.js";
 import type { ILogger } from "../../Microsoft.Extensions.Logging/internal/index.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Exception, IDisposable, Object as ClrObject, TimeSpan, Void } from "@tsonic/dotnet/System.js";
-import * as System_Net_Http_Internal from "@tsonic/dotnet/System.Net.Http.js";
-import type { DelegatingHandler, HttpRequestMessage, HttpResponseMessage } from "@tsonic/dotnet/System.Net.Http.js";
-import type { CancellationToken } from "@tsonic/dotnet/System.Threading.js";
-import type { Task, ValueTask } from "@tsonic/dotnet/System.Threading.Tasks.js";
+import * as System_Net_Http_Internal from "@tsonic/dotnet/System.Net.Http/internal/index.js";
+import type { DelegatingHandler, HttpRequestMessage, HttpResponseMessage } from "@tsonic/dotnet/System.Net.Http/internal/index.js";
+import type { Task_1, ValueTask, ValueTask_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 { Exception, IDisposable, Object as ClrObject, TimeSpan, Void } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface IHttpClientAsyncLogger$instance extends IHttpClientLogger {
     readonly __tsonic_iface_Microsoft_Extensions_Http_Logging_IHttpClientAsyncLogger: never;
@@ -21,7 +21,7 @@ export interface IHttpClientAsyncLogger$instance extends IHttpClientLogger {
     LogRequestFailed(context: unknown, request: HttpRequestMessage, response: HttpResponseMessage, exception: Exception, elapsed: TimeSpan): void;
     LogRequestFailedAsync(context: unknown, request: HttpRequestMessage, response: HttpResponseMessage, exception: Exception, elapsed: TimeSpan, cancellationToken?: CancellationToken): ValueTask;
     LogRequestStart(request: HttpRequestMessage): unknown | undefined;
-    LogRequestStartAsync(request: HttpRequestMessage, cancellationToken?: CancellationToken): ValueTask<unknown>;
+    LogRequestStartAsync(request: HttpRequestMessage, cancellationToken?: CancellationToken): ValueTask_1<unknown>;
     LogRequestStop(context: unknown, request: HttpRequestMessage, response: HttpResponseMessage, elapsed: TimeSpan): void;
     LogRequestStopAsync(context: unknown, request: HttpRequestMessage, response: HttpResponseMessage, elapsed: TimeSpan, cancellationToken?: CancellationToken): ValueTask;
 }
@@ -43,10 +43,12 @@ export interface IHttpClientLogger$instance {
 export type IHttpClientLogger = IHttpClientLogger$instance;
 
 export interface LoggingHttpMessageHandler$instance extends DelegatingHandler {
+    readonly __tsonic_type_Microsoft_Extensions_Http_Logging_LoggingHttpMessageHandler: never;
+
     readonly __tsonic_iface_System_IDisposable: never;
 
     Send(request: HttpRequestMessage, cancellationToken: CancellationToken): HttpResponseMessage;
-    SendAsync(request: HttpRequestMessage, cancellationToken: CancellationToken): Task<HttpResponseMessage>;
+    SendAsync(request: HttpRequestMessage, cancellationToken: CancellationToken): Task_1<HttpResponseMessage>;
 }
 
 
@@ -59,10 +61,12 @@ export const LoggingHttpMessageHandler: {
 export type LoggingHttpMessageHandler = LoggingHttpMessageHandler$instance;
 
 export interface LoggingScopeHttpMessageHandler$instance extends DelegatingHandler {
+    readonly __tsonic_type_Microsoft_Extensions_Http_Logging_LoggingScopeHttpMessageHandler: never;
+
     readonly __tsonic_iface_System_IDisposable: never;
 
     Send(request: HttpRequestMessage, cancellationToken: CancellationToken): HttpResponseMessage;
-    SendAsync(request: HttpRequestMessage, cancellationToken: CancellationToken): Task<HttpResponseMessage>;
+    SendAsync(request: HttpRequestMessage, cancellationToken: CancellationToken): Task_1<HttpResponseMessage>;
 }
 
 

package/Microsoft.Extensions.Internal/internal/index.d.ts

@@ -6,8 +6,8 @@
 import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
 
 // Import types from other namespaces
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { DateTimeOffset, Object as ClrObject } from "@tsonic/dotnet/System.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { DateTimeOffset, Object as ClrObject } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface ISystemClock$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Internal_ISystemClock: never;
@@ -18,7 +18,9 @@ export interface ISystemClock$instance {
 
 export type ISystemClock = ISystemClock$instance;
 
-export interface SystemClock$instance {
+export interface SystemClock$instance extends ISystemClock$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Internal_SystemClock: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Internal_ISystemClock: never;
 
     readonly UtcNow: DateTimeOffset;
@@ -34,8 +36,6 @@ export interface __SystemClock$views {
     As_ISystemClock(): ISystemClock$instance;
 }
 
-export interface SystemClock$instance extends ISystemClock$instance {}
-
 export type SystemClock = SystemClock$instance & __SystemClock$views;
 
 

package/Microsoft.Extensions.Localization/internal/index.d.ts

@@ -8,17 +8,17 @@ import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint12
 // Import types from other namespaces
 import type { ILogger, ILoggerFactory } from "../../Microsoft.Extensions.Logging/internal/index.js";
 import type { IOptions_1 } from "../../Microsoft.Extensions.Options/internal/index.js";
-import type { IEnumerable, IList } from "@tsonic/dotnet/System.Collections.Generic.js";
-import type { CultureInfo } from "@tsonic/dotnet/System.Globalization.js";
-import * as System_Internal from "@tsonic/dotnet/System.js";
-import type { Attribute, Boolean as ClrBoolean, Func, Object as ClrObject, String as ClrString, Type } from "@tsonic/dotnet/System.js";
-import type { Assembly, TypeInfo } from "@tsonic/dotnet/System.Reflection.js";
-import type { ResourceManager } from "@tsonic/dotnet/System.Resources.js";
+import type { IEnumerable_1, IList_1 } from "@tsonic/dotnet/System.Collections.Generic/internal/index.js";
+import type { CultureInfo } from "@tsonic/dotnet/System.Globalization/internal/index.js";
+import type { Assembly, TypeInfo } from "@tsonic/dotnet/System.Reflection/internal/index.js";
+import type { ResourceManager } from "@tsonic/dotnet/System.Resources/internal/index.js";
+import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
+import type { Attribute, Boolean as ClrBoolean, Func_2, Object as ClrObject, String as ClrString, Type } from "@tsonic/dotnet/System/internal/index.js";
 
 export interface IResourceNamesCache$instance {
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IResourceNamesCache: never;
 
-    GetOrAdd(name: string, valueFactory: Func<System_Internal.String, IList<System_Internal.String>>): IList<System_Internal.String> | undefined;
+    GetOrAdd(name: string, valueFactory: Func_2<System_Internal.String, IList_1<System_Internal.String>>): IList_1<System_Internal.String> | undefined;
 }
 
 
@@ -29,7 +29,7 @@ export interface IStringLocalizer$instance {
 
     get_Item2(name: string, ...arguments: unknown[]): LocalizedString;
     get_Item2(name: string): LocalizedString;
-    GetAllStrings(includeParentCultures: boolean): IEnumerable<LocalizedString>;
+    GetAllStrings(includeParentCultures: boolean): IEnumerable_1<LocalizedString>;
 }
 
 
@@ -40,7 +40,7 @@ export interface IStringLocalizer_1$instance<T> extends IStringLocalizer {
 
     get_Item2(name: string, ...arguments: unknown[]): LocalizedString;
     get_Item2(name: string): LocalizedString;
-    GetAllStrings(includeParentCultures: boolean): IEnumerable<LocalizedString>;
+    GetAllStrings(includeParentCultures: boolean): IEnumerable_1<LocalizedString>;
     get_Item(name: string): LocalizedString;
 }
 
@@ -60,6 +60,8 @@ export interface IStringLocalizerFactory$instance {
 export type IStringLocalizerFactory = IStringLocalizerFactory$instance;
 
 export interface LocalizationOptions$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_LocalizationOptions: never;
+
     ResourcesPath: string;
 }
 
@@ -72,6 +74,8 @@ export const LocalizationOptions: {
 export type LocalizationOptions = LocalizationOptions$instance;
 
 export interface LocalizedString$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_LocalizedString: never;
+
     readonly Name: string;
     readonly ResourceNotFound: boolean;
     readonly SearchedLocation: string | undefined;
@@ -90,6 +94,8 @@ export const LocalizedString: {
 export type LocalizedString = LocalizedString$instance;
 
 export interface ResourceLocationAttribute$instance extends Attribute {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_ResourceLocationAttribute: never;
+
     readonly ResourceLocation: string;
 }
 
@@ -102,11 +108,13 @@ export const ResourceLocationAttribute: {
 export type ResourceLocationAttribute = ResourceLocationAttribute$instance;
 
 export interface ResourceManagerStringLocalizer$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_ResourceManagerStringLocalizer: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IStringLocalizer: never;
 
     get_Item(name: string): LocalizedString;
     get_Item(name: string, ...arguments: unknown[]): LocalizedString;
-    GetAllStrings(includeParentCultures: boolean): IEnumerable<LocalizedString>;
+    GetAllStrings(includeParentCultures: boolean): IEnumerable_1<LocalizedString>;
 }
 
 
@@ -122,7 +130,9 @@ export interface __ResourceManagerStringLocalizer$views {
 export type ResourceManagerStringLocalizer = ResourceManagerStringLocalizer$instance & __ResourceManagerStringLocalizer$views;
 
 
-export interface ResourceManagerStringLocalizerFactory$instance {
+export interface ResourceManagerStringLocalizerFactory$instance extends IStringLocalizerFactory$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_ResourceManagerStringLocalizerFactory: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IStringLocalizerFactory: never;
 
     Create(resourceSource: Type): IStringLocalizer;
@@ -146,15 +156,15 @@ export interface __ResourceManagerStringLocalizerFactory$views {
     As_IStringLocalizerFactory(): IStringLocalizerFactory$instance;
 }
 
-export interface ResourceManagerStringLocalizerFactory$instance extends IStringLocalizerFactory$instance {}
-
 export type ResourceManagerStringLocalizerFactory = ResourceManagerStringLocalizerFactory$instance & __ResourceManagerStringLocalizerFactory$views;
 
 
-export interface ResourceNamesCache$instance {
+export interface ResourceNamesCache$instance extends IResourceNamesCache$instance {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_ResourceNamesCache: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IResourceNamesCache: never;
 
-    GetOrAdd(name: string, valueFactory: Func<System_Internal.String, IList<System_Internal.String>>): IList<System_Internal.String> | undefined;
+    GetOrAdd(name: string, valueFactory: Func_2<System_Internal.String, IList_1<System_Internal.String>>): IList_1<System_Internal.String> | undefined;
 }
 
 
@@ -167,12 +177,12 @@ export interface __ResourceNamesCache$views {
     As_IResourceNamesCache(): IResourceNamesCache$instance;
 }
 
-export interface ResourceNamesCache$instance extends IResourceNamesCache$instance {}
-
 export type ResourceNamesCache = ResourceNamesCache$instance & __ResourceNamesCache$views;
 
 
 export interface RootNamespaceAttribute$instance extends Attribute {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_RootNamespaceAttribute: never;
+
     readonly RootNamespace: string;
 }
 
@@ -185,12 +195,14 @@ export const RootNamespaceAttribute: {
 export type RootNamespaceAttribute = RootNamespaceAttribute$instance;
 
 export interface StringLocalizer_1$instance<TResourceSource> extends IStringLocalizer_1<TResourceSource> {
+    readonly __tsonic_type_Microsoft_Extensions_Localization_StringLocalizer_1: never;
+
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IStringLocalizer: never;
     readonly __tsonic_iface_Microsoft_Extensions_Localization_IStringLocalizer_1: never;
 
     get_Item(name: string): LocalizedString;
     get_Item(name: string, ...arguments: unknown[]): LocalizedString;
-    GetAllStrings(includeParentCultures: boolean): IEnumerable<LocalizedString>;
+    GetAllStrings(includeParentCultures: boolean): IEnumerable_1<LocalizedString>;
 }
 
 
@@ -207,7 +219,7 @@ export type StringLocalizer_1<TResourceSource> = StringLocalizer_1$instance<TRes
 
 
 export abstract class StringLocalizerExtensions$instance {
-    static GetAllStrings(stringLocalizer: IStringLocalizer): IEnumerable<LocalizedString>;
+    static GetAllStrings(stringLocalizer: IStringLocalizer): IEnumerable_1<LocalizedString>;
     static GetString(stringLocalizer: IStringLocalizer, name: string, ...arguments: unknown[]): LocalizedString;
     static GetString(stringLocalizer: IStringLocalizer, name: string): LocalizedString;
 }