@tsonic/microsoft-extensions 10.0.40 → 10.0.42

package/__internal/extensions/index.d.ts

@@ -40,8 +40,9 @@ import * as System_Text from "@tsonic/dotnet/System.Text/internal/index.js";
 import * as System_Threading from "@tsonic/dotnet/System.Threading/internal/index.js";
 import * as System_Threading_Tasks from "@tsonic/dotnet/System.Threading.Tasks/internal/index.js";
 
-// Import primitive type aliases
-import type { sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
+// Core type aliases from @tsonic/core
+import type { fnptr, ptr, sbyte, byte, short, ushort, int, uint, long, ulong, int128, uint128, half, float, double, decimal, nint, nuint, char } from '@tsonic/core/types.js';
+
 
 // Import sticky extension scope helper
 import type { Rewrap } from '@tsonic/core/lang.js';
@@ -49,9 +50,6 @@ import type { Rewrap } from '@tsonic/core/lang.js';
 // Import CLR type aliases for generic type arguments
 import * as System_Internal from "@tsonic/dotnet/System/internal/index.js";
 
-// Import unsafe type markers
-import type { ptr } from '@tsonic/core/types.js';
-
 // Internal helper types for sticky extension scopes
 type __TsonicExtMapOf<T> = T extends { __tsonic_ext?: infer M } ? M : {};
 type __TsonicMergeExtMaps<A, B> = A & B;
@@ -59,8 +57,8 @@ type __TsonicWithExt<TShape, K extends string, TApplier> = { __tsonic_ext?: __Ts
 
 // Extension method table for namespace: Microsoft.Extensions.Caching.Distributed
 interface __TsonicExtMethods_Microsoft_Extensions_Caching_Distributed {
-  GetString(this: Microsoft_Extensions_Caching_Distributed.IDistributedCache, key: string): Rewrap<this, string | undefined>;
-  GetStringAsync(this: Microsoft_Extensions_Caching_Distributed.IDistributedCache, key: string, token?: System_Threading.CancellationToken): Rewrap<this, System_Threading_Tasks.Task_1<string | undefined>>;
+  GetString(this: Microsoft_Extensions_Caching_Distributed.IDistributedCache, key: string): Rewrap<this, string | null>;
+  GetStringAsync(this: Microsoft_Extensions_Caching_Distributed.IDistributedCache, key: string, token?: System_Threading.CancellationToken): Rewrap<this, System_Threading_Tasks.Task_1<string | null>>;
   Set(this: Microsoft_Extensions_Caching_Distributed.IDistributedCache, key: string, value: byte[]): Rewrap<this, void>;
   SetAbsoluteExpiration(this: Microsoft_Extensions_Caching_Distributed.DistributedCacheEntryOptions, relative: System.TimeSpan): Rewrap<this, Microsoft_Extensions_Caching_Distributed.DistributedCacheEntryOptions>;
   SetAbsoluteExpiration(this: Microsoft_Extensions_Caching_Distributed.DistributedCacheEntryOptions, absolute: System.DateTimeOffset): Rewrap<this, Microsoft_Extensions_Caching_Distributed.DistributedCacheEntryOptions>;
@@ -87,21 +85,21 @@ export type ExtensionMethods_Microsoft_Extensions_Caching_Distributed<TShape> =
 interface __TsonicExtMethods_Microsoft_Extensions_Caching_Memory {
   AddExpirationToken(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, expirationToken: Microsoft_Extensions_Primitives.IChangeToken): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
   AddExpirationToken(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, expirationToken: Microsoft_Extensions_Primitives.IChangeToken): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
-  Get(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown): Rewrap<this, unknown | undefined>;
-  Get<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown): Rewrap<this, TItem | undefined>;
-  GetOrCreate<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, TItem>): Rewrap<this, TItem | undefined>;
-  GetOrCreate<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, TItem>, createOptions: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions): Rewrap<this, TItem | undefined>;
-  GetOrCreateAsync<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, System_Threading_Tasks.Task_1<TItem>>): Rewrap<this, System_Threading_Tasks.Task_1<TItem | undefined>>;
-  GetOrCreateAsync<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, System_Threading_Tasks.Task_1<TItem>>, createOptions: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions): Rewrap<this, System_Threading_Tasks.Task_1<TItem | undefined>>;
+  Get(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown): Rewrap<this, unknown | null>;
+  Get<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown): Rewrap<this, TItem | null>;
+  GetOrCreate<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, TItem>): Rewrap<this, TItem | null>;
+  GetOrCreate<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, TItem>, createOptions: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions | null): Rewrap<this, TItem | null>;
+  GetOrCreateAsync<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, System_Threading_Tasks.Task_1<TItem>>): Rewrap<this, System_Threading_Tasks.Task_1<TItem | null>>;
+  GetOrCreateAsync<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, factory: System.Func_2<Microsoft_Extensions_Caching_Memory.ICacheEntry, System_Threading_Tasks.Task_1<TItem>>, createOptions: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions | null): Rewrap<this, System_Threading_Tasks.Task_1<TItem | null>>;
   RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
-  RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate, state: unknown): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
+  RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate, state: unknown | null): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
   RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
-  RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate, state: unknown): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
-  Set<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem): Rewrap<this, TItem>;
-  Set<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, absoluteExpiration: System.DateTimeOffset): Rewrap<this, TItem>;
-  Set<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, absoluteExpirationRelativeToNow: System.TimeSpan): Rewrap<this, TItem>;
-  Set<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, expirationToken: Microsoft_Extensions_Primitives.IChangeToken): Rewrap<this, TItem>;
-  Set<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, options: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions): Rewrap<this, TItem>;
+  RegisterPostEvictionCallback(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, callback: Microsoft_Extensions_Caching_Memory.PostEvictionDelegate, state: unknown | null): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
+  Set<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem): Rewrap<this, TItem>;
+  Set<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, absoluteExpiration: System.DateTimeOffset): Rewrap<this, TItem>;
+  Set<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, absoluteExpirationRelativeToNow: System.TimeSpan): Rewrap<this, TItem>;
+  Set<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, expirationToken: Microsoft_Extensions_Primitives.IChangeToken): Rewrap<this, TItem>;
+  Set<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem, options: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions | null): Rewrap<this, TItem>;
   SetAbsoluteExpiration(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, relative: System.TimeSpan): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
   SetAbsoluteExpiration(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, absolute: System.DateTimeOffset): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
   SetAbsoluteExpiration(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, relative: System.TimeSpan): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
@@ -113,8 +111,8 @@ interface __TsonicExtMethods_Microsoft_Extensions_Caching_Memory {
   SetSize(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, size: long): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
   SetSlidingExpiration(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, offset: System.TimeSpan): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
   SetSlidingExpiration(this: Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions, offset: System.TimeSpan): Rewrap<this, Microsoft_Extensions_Caching_Memory.MemoryCacheEntryOptions>;
-  SetValue(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, value: unknown): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
-  TryGetValue<TItem>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem): Rewrap<this, boolean>;
+  SetValue(this: Microsoft_Extensions_Caching_Memory.ICacheEntry, value: unknown | null): Rewrap<this, Microsoft_Extensions_Caching_Memory.ICacheEntry>;
+  TryGetValue<TItem extends unknown>(this: Microsoft_Extensions_Caching_Memory.IMemoryCache, key: unknown, value: TItem | null): Rewrap<this, boolean>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.Caching.Memory
@@ -130,36 +128,36 @@ export type ExtensionMethods_Microsoft_Extensions_Caching_Memory<TShape> =
 
 // Extension method table for namespace: Microsoft.Extensions.Configuration
 interface __TsonicExtMethods_Microsoft_Extensions_Configuration {
-  Add<TSource extends Microsoft_Extensions_Configuration.IConfigurationSource>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<TSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  Add<TSource extends unknown & Microsoft_Extensions_Configuration.IConfigurationSource>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<TSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddCommandLine(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, args: string[]): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddCommandLine(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, args: string[], switchMappings: System_Collections_Generic.IDictionary_2<System_Internal.String, System_Internal.String>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddCommandLine(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_CommandLine.CommandLineConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddCommandLine(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, args: string[], switchMappings: System_Collections_Generic.IDictionary_2<System_Internal.String, System_Internal.String> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddCommandLine(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_CommandLine.CommandLineConfigurationSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddConfiguration(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddConfiguration(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, config: Microsoft_Extensions_Configuration.IConfiguration, shouldDisposeConfiguration: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddEnvironmentVariables(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddEnvironmentVariables(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, prefix: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddEnvironmentVariables(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_EnvironmentVariables.EnvironmentVariablesConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddEnvironmentVariables(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, prefix: string | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddEnvironmentVariables(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_EnvironmentVariables.EnvironmentVariablesConfigurationSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddInMemoryCollection(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddInMemoryCollection(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, initialData: System_Collections_Generic.IEnumerable_1<System_Collections_Generic.KeyValuePair_2<System_Internal.String, System_Internal.String>>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddInMemoryCollection(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, initialData: System_Collections_Generic.IEnumerable_1<System_Collections_Generic.KeyValuePair_2<System_Internal.String, System_Internal.String>> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Ini.IniConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider | null, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddIniFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Ini.IniConfigurationSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddIniStream(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, stream: System_IO.Stream): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Json.JsonConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider | null, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddJsonFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Json.JsonConfigurationSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddJsonStream(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, stream: System_IO.Stream): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddKeyPerFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, directoryPath: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddKeyPerFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, directoryPath: string, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddKeyPerFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, directoryPath: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddKeyPerFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_KeyPerFile.KeyPerFileConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddUserSecrets<T>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddUserSecrets<T>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddUserSecrets<T>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddUserSecrets<T extends (object | null)>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddUserSecrets<T extends (object | null)>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddUserSecrets<T extends (object | null)>(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddUserSecrets(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, assembly: System_Reflection.Assembly): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddUserSecrets(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, assembly: System_Reflection.Assembly, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddUserSecrets(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, assembly: System_Reflection.Assembly, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
@@ -168,29 +166,29 @@ interface __TsonicExtMethods_Microsoft_Extensions_Configuration {
   AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
-  AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Xml.XmlConfigurationSource>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, provider: Microsoft_Extensions_FileProviders.IFileProvider | null, path: string, optional: boolean, reloadOnChange: boolean): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
+  AddXmlFile(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, configureSource: System.Action_1<Microsoft_Extensions_Configuration_Xml.XmlConfigurationSource> | null): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AddXmlStream(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, stream: System_IO.Stream): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   AsEnumerable(this: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, System_Collections_Generic.IEnumerable_1<System_Collections_Generic.KeyValuePair_2<System_Internal.String, System_Internal.String>>>;
   AsEnumerable(this: Microsoft_Extensions_Configuration.IConfiguration, makePathsRelative: boolean): Rewrap<this, System_Collections_Generic.IEnumerable_1<System_Collections_Generic.KeyValuePair_2<System_Internal.String, System_Internal.String>>>;
-  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, key: string, instance: unknown): Rewrap<this, void>;
-  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, instance: unknown): Rewrap<this, void>;
-  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, instance: unknown, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, void>;
-  Exists(this: Microsoft_Extensions_Configuration.IConfigurationSection): Rewrap<this, boolean>;
-  Get<T>(this: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, T | undefined>;
-  Get<T>(this: Microsoft_Extensions_Configuration.IConfiguration, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, T | undefined>;
-  Get(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type): Rewrap<this, unknown | undefined>;
-  Get(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, unknown | undefined>;
-  GetConnectionString(this: Microsoft_Extensions_Configuration.IConfiguration, name: string): Rewrap<this, string | undefined>;
+  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, key: string, instance: unknown | null): Rewrap<this, void>;
+  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, instance: unknown | null): Rewrap<this, void>;
+  Bind(this: Microsoft_Extensions_Configuration.IConfiguration, instance: unknown | null, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, void>;
+  Exists(this: Microsoft_Extensions_Configuration.IConfigurationSection | null): Rewrap<this, boolean>;
+  Get<T extends unknown>(this: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, T | null>;
+  Get<T extends unknown>(this: Microsoft_Extensions_Configuration.IConfiguration, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, T | null>;
+  Get(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type): Rewrap<this, unknown | null>;
+  Get(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, configureOptions: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, unknown | null>;
+  GetConnectionString(this: Microsoft_Extensions_Configuration.IConfiguration, name: string): Rewrap<this, string | null>;
   GetDebugView(this: Microsoft_Extensions_Configuration.IConfigurationRoot): Rewrap<this, string>;
-  GetDebugView(this: Microsoft_Extensions_Configuration.IConfigurationRoot, processValue: System.Func_2<Microsoft_Extensions_Configuration.ConfigurationDebugViewContext, System_Internal.String>): Rewrap<this, string>;
-  GetFileLoadExceptionHandler(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, System.Action_1<Microsoft_Extensions_Configuration.FileLoadExceptionContext> | undefined>;
+  GetDebugView(this: Microsoft_Extensions_Configuration.IConfigurationRoot, processValue: System.Func_2<Microsoft_Extensions_Configuration.ConfigurationDebugViewContext, System_Internal.String> | null): Rewrap<this, string>;
+  GetFileLoadExceptionHandler(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, System.Action_1<Microsoft_Extensions_Configuration.FileLoadExceptionContext> | null>;
   GetFileProvider(this: Microsoft_Extensions_Configuration.IConfigurationBuilder): Rewrap<this, Microsoft_Extensions_FileProviders.IFileProvider>;
   GetRequiredSection(this: Microsoft_Extensions_Configuration.IConfiguration, key: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationSection>;
-  GetValue<T>(this: Microsoft_Extensions_Configuration.IConfiguration, key: string): Rewrap<this, T | undefined>;
-  GetValue<T>(this: Microsoft_Extensions_Configuration.IConfiguration, key: string, defaultValue: T): Rewrap<this, T | undefined>;
-  GetValue(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, key: string): Rewrap<this, unknown | undefined>;
-  GetValue(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, key: string, defaultValue: unknown): Rewrap<this, unknown | undefined>;
+  GetValue<T extends unknown>(this: Microsoft_Extensions_Configuration.IConfiguration, key: string): Rewrap<this, T | null>;
+  GetValue<T extends unknown>(this: Microsoft_Extensions_Configuration.IConfiguration, key: string, defaultValue: T): Rewrap<this, T | null>;
+  GetValue(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, key: string): Rewrap<this, unknown | null>;
+  GetValue(this: Microsoft_Extensions_Configuration.IConfiguration, type: System.Type, key: string, defaultValue: unknown | null): Rewrap<this, unknown | null>;
   SetBasePath(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, basePath: string): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   SetFileLoadExceptionHandler(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, handler: System.Action_1<Microsoft_Extensions_Configuration.FileLoadExceptionContext>): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
   SetFileProvider(this: Microsoft_Extensions_Configuration.IConfigurationBuilder, fileProvider: Microsoft_Extensions_FileProviders.IFileProvider): Rewrap<this, Microsoft_Extensions_Configuration.IConfigurationBuilder>;
@@ -211,58 +209,58 @@ export type ExtensionMethods_Microsoft_Extensions_Configuration<TShape> =
 interface __TsonicExtMethods_Microsoft_Extensions_DependencyInjection {
   AddAsKeyed(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, lifetime?: Microsoft_Extensions_DependencyInjection.ServiceLifetime): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
   AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddAsyncCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, System_Threading_Tasks.Task_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
   AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, instance: Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, instance: Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck, failureStatus?: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus?: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, instance: Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck, failureStatus?: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus?: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
   AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddCheck(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, check: System.Func_2<System_Threading.CancellationToken, Microsoft_Extensions_Diagnostics_HealthChecks.HealthCheckResult>, tags?: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, timeout?: System.Nullable_1<System.TimeSpan>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
   AddDefaultLogger(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddDistributedMemoryCache(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddDistributedMemoryCache(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, setupAction: System.Action_1<Microsoft_Extensions_Caching_Memory.MemoryDistributedCacheOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddHealthChecks(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddHostedService<THostedService extends Microsoft_Extensions_Hosting.IHostedService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddHostedService<THostedService extends Microsoft_Extensions_Hosting.IHostedService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, THostedService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddHostedService<THostedService extends (object | null) & Microsoft_Extensions_Hosting.IHostedService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddHostedService<THostedService extends (object | null) & Microsoft_Extensions_Hosting.IHostedService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, THostedService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddHttpClient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddHttpClient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddHttpClient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, configureClient: System.Action_1<System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddHttpClient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, configureClient: System.Action_2<System.IServiceProvider, System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureClient: System.Action_1<System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureClient: System.Action_2<System.IServiceProvider, System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient, TImplementation extends TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, factory: System.Func_2<System_Net_Http.HttpClient, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient, TImplementation extends TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, factory: System.Func_2<System_Net_Http.HttpClient, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient, TImplementation extends TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpClient<TClient, TImplementation extends TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureClient: System.Action_1<System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureClient: System.Action_2<System.IServiceProvider, System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null), TImplementation extends (object | null) & TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, factory: System.Func_2<System_Net_Http.HttpClient, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null), TImplementation extends (object | null) & TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, factory: System.Func_2<System_Net_Http.HttpClient, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null), TImplementation extends (object | null) & TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddHttpClient<TClient extends (object | null), TImplementation extends (object | null) & TClient>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TImplementation>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddHttpMessageHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler: System.Func_1<System_Net_Http.DelegatingHandler>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddHttpMessageHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler: System.Func_2<System.IServiceProvider, System_Net_Http.DelegatingHandler>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddHttpMessageHandler<THandler extends System_Net_Http.DelegatingHandler>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedScoped<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationInstance: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationInstance: TService): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedTransient<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddKeyedTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddHttpMessageHandler<THandler extends unknown & System_Net_Http.DelegatingHandler>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedScoped<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationInstance: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationInstance: TService): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedTransient<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddKeyedTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddLocalization(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddLocalization(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, setupAction: System.Action_1<Microsoft_Extensions_Localization.LocalizationOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddLogger(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, httpClientLoggerFactory: System.Func_2<System.IServiceProvider, Microsoft_Extensions_Http_Logging.IHttpClientLogger>, wrapHandlersPipeline?: boolean): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddLogger<TLogger extends Microsoft_Extensions_Http_Logging.IHttpClientLogger>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, wrapHandlersPipeline?: boolean): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddLogger<TLogger extends unknown & Microsoft_Extensions_Http_Logging.IHttpClientLogger>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, wrapHandlersPipeline?: boolean): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   AddLogging(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddLogging(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configure: System.Action_1<Microsoft_Extensions_Logging.ILoggingBuilder>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddMemoryCache(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
@@ -270,89 +268,89 @@ interface __TsonicExtMethods_Microsoft_Extensions_DependencyInjection {
   AddMetrics(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddMetrics(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configure: System.Action_1<Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddOptions(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddOptions<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
-  AddOptions<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
-  AddOptionsWithValidateOnStart<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name?: string): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  AddOptions<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  AddOptions<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string | null): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  AddOptionsWithValidateOnStart<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name?: string | null): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
   AddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddScoped<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddScoped<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddSingleton<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddSingleton<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationInstance: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationInstance: TService): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationInstance: TService): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddTransient<TService, TImplementation extends TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddTransient<TService extends (object | null), TImplementation extends (object | null) & TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  AddTypeActivatedCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddTypeActivatedCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddTypeActivatedCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddTypeActivatedCheck<T extends Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout: System.TimeSpan, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
-  AddTypedClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddTypedClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, factory: System.Func_2<System_Net_Http.HttpClient, TClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddTypedClient<TClient>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  AddValidation(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions?: System.Action_1<Microsoft_Extensions_Validation.ValidationOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  AddTypeActivatedCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddTypeActivatedCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddTypeActivatedCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddTypeActivatedCheck<T extends (object | null) & Microsoft_Extensions_Diagnostics_HealthChecks.IHealthCheck>(this: Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder, name: string, failureStatus: System.Nullable_1<Microsoft_Extensions_Diagnostics_HealthChecks.HealthStatus>, tags: System_Collections_Generic.IEnumerable_1<System_Internal.String>, timeout: System.TimeSpan, ...args: unknown[]): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHealthChecksBuilder>;
+  AddTypedClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddTypedClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, factory: System.Func_2<System_Net_Http.HttpClient, TClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddTypedClient<TClient extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, factory: System.Func_3<System_Net_Http.HttpClient, System.IServiceProvider, TClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  AddValidation(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions?: System.Action_1<Microsoft_Extensions_Validation.ValidationOptions> | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddWebEncoders(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   AddWebEncoders(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, setupAction: System.Action_1<Microsoft_Extensions_WebEncoders.WebEncoderOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Bind<TOptions>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
-  Bind<TOptions>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
-  BindConfiguration<TOptions>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, configSectionPath: string, configureBinder?: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  Bind<TOptions extends (object | null)>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  Bind<TOptions extends (object | null)>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  BindConfiguration<TOptions extends (object | null)>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>, configSectionPath: string, configureBinder?: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
   BuildServiceProvider(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.ServiceProvider>;
   BuildServiceProvider(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, validateScopes: boolean): Rewrap<this, Microsoft_Extensions_DependencyInjection.ServiceProvider>;
   BuildServiceProvider(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, options: Microsoft_Extensions_DependencyInjection.ServiceProviderOptions): Rewrap<this, Microsoft_Extensions_DependencyInjection.ServiceProvider>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  Configure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string | null, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string | null, config: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  Configure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string | null, config: Microsoft_Extensions_Configuration.IConfiguration, configureBinder: System.Action_1<Microsoft_Extensions_Configuration.BinderOptions> | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   Configure(this: Microsoft_Extensions_DependencyInjection.ISocketsHttpHandlerBuilder, configure: System.Action_2<System_Net_Http.SocketsHttpHandler, System.IServiceProvider>): Rewrap<this, Microsoft_Extensions_DependencyInjection.ISocketsHttpHandlerBuilder>;
   Configure(this: Microsoft_Extensions_DependencyInjection.ISocketsHttpHandlerBuilder, configuration: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_DependencyInjection.ISocketsHttpHandlerBuilder>;
   ConfigureAdditionalHttpMessageHandlers(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureAdditionalHandlers: System.Action_2<System_Collections_Generic.IList_1<System_Net_Http.DelegatingHandler>, System.IServiceProvider>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  ConfigureAll<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  ConfigureAll<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   ConfigureHttpClient(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureClient: System.Action_1<System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   ConfigureHttpClient(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureClient: System.Action_2<System.IServiceProvider, System_Net_Http.HttpClient>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   ConfigureHttpClientDefaults(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configure: System.Action_1<Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   ConfigureHttpMessageHandlerBuilder(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureBuilder: System.Action_1<Microsoft_Extensions_Http.HttpMessageHandlerBuilder>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  ConfigureOptions<TConfigureOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  ConfigureOptions<TConfigureOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   ConfigureOptions(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   ConfigureOptions(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureInstance: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   ConfigurePrimaryHttpMessageHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler: System.Func_1<System_Net_Http.HttpMessageHandler>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   ConfigurePrimaryHttpMessageHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler: System.Func_2<System.IServiceProvider, System_Net_Http.HttpMessageHandler>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  ConfigurePrimaryHttpMessageHandler<THandler extends System_Net_Http.HttpMessageHandler>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  ConfigurePrimaryHttpMessageHandler<THandler extends unknown & System_Net_Http.HttpMessageHandler>(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   ConfigurePrimaryHttpMessageHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler: System.Action_2<System_Net_Http.HttpMessageHandler, System.IServiceProvider>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   CreateAsyncScope(this: Microsoft_Extensions_DependencyInjection.IServiceScopeFactory): Rewrap<this, Microsoft_Extensions_DependencyInjection.AsyncServiceScope>;
   CreateAsyncScope(this: System.IServiceProvider): Rewrap<this, Microsoft_Extensions_DependencyInjection.AsyncServiceScope>;
   CreateScope(this: System.IServiceProvider): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceScope>;
-  GetKeyedService<T>(this: System.IServiceProvider, serviceKey: unknown): Rewrap<this, T | undefined>;
-  GetKeyedService(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown): Rewrap<this, unknown | undefined>;
-  GetKeyedServices<T>(this: System.IServiceProvider, serviceKey: unknown): Rewrap<this, System_Collections_Generic.IEnumerable_1<T>>;
-  GetKeyedServices(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown): Rewrap<this, System_Collections_Generic.IEnumerable_1<unknown | undefined>>;
-  GetRequiredKeyedService(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown): Rewrap<this, unknown>;
-  GetRequiredKeyedService<T>(this: System.IServiceProvider, serviceKey: unknown): Rewrap<this, T>;
+  GetKeyedService<T extends unknown>(this: System.IServiceProvider, serviceKey: unknown | null): Rewrap<this, T | null>;
+  GetKeyedService(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, unknown | null>;
+  GetKeyedServices<T extends unknown>(this: System.IServiceProvider, serviceKey: unknown | null): Rewrap<this, System_Collections_Generic.IEnumerable_1<T>>;
+  GetKeyedServices(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, System_Collections_Generic.IEnumerable_1<unknown | null>>;
+  GetRequiredKeyedService(this: System.IServiceProvider, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, unknown>;
+  GetRequiredKeyedService<T extends unknown>(this: System.IServiceProvider, serviceKey: unknown | null): Rewrap<this, T>;
   GetRequiredService(this: System.IServiceProvider, serviceType: System.Type): Rewrap<this, unknown>;
-  GetRequiredService<T>(this: System.IServiceProvider): Rewrap<this, T>;
-  GetService<T>(this: System.IServiceProvider): Rewrap<this, T | undefined>;
-  GetServices<T>(this: System.IServiceProvider): Rewrap<this, System_Collections_Generic.IEnumerable_1<T>>;
-  GetServices(this: System.IServiceProvider, serviceType: System.Type): Rewrap<this, System_Collections_Generic.IEnumerable_1<unknown | undefined>>;
-  PostConfigure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  PostConfigure<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  PostConfigureAll<TOptions>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  GetRequiredService<T extends unknown>(this: System.IServiceProvider): Rewrap<this, T>;
+  GetService<T extends unknown>(this: System.IServiceProvider): Rewrap<this, T | null>;
+  GetServices<T extends unknown>(this: System.IServiceProvider): Rewrap<this, System_Collections_Generic.IEnumerable_1<T>>;
+  GetServices(this: System.IServiceProvider, serviceType: System.Type): Rewrap<this, System_Collections_Generic.IEnumerable_1<unknown | null>>;
+  PostConfigure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  PostConfigure<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, name: string | null, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  PostConfigureAll<TOptions extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, configureOptions: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   RedactLoggedHeaders(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, shouldRedactHeaderValue: System.Func_2<System_Internal.String, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   RedactLoggedHeaders(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, redactedLoggedHeaderNames: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   RemoveAllLoggers(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   RemoveAsKeyed(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   SetHandlerLifetime(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, handlerLifetime: System.TimeSpan): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  UseSocketsHttpHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler?: System.Action_2<System_Net_Http.SocketsHttpHandler, System.IServiceProvider>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
+  UseSocketsHttpHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureHandler?: System.Action_2<System_Net_Http.SocketsHttpHandler, System.IServiceProvider> | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
   UseSocketsHttpHandler(this: Microsoft_Extensions_DependencyInjection.IHttpClientBuilder, configureBuilder: System.Action_1<Microsoft_Extensions_DependencyInjection.ISocketsHttpHandlerBuilder>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IHttpClientBuilder>;
-  ValidateDataAnnotations<TOptions>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
-  ValidateOnStart<TOptions>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  ValidateDataAnnotations<TOptions extends (object | null)>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
+  ValidateOnStart<TOptions extends (object | null)>(this: Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>): Rewrap<this, Microsoft_Extensions_Options.OptionsBuilder_1<TOptions>>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.DependencyInjection
@@ -370,47 +368,47 @@ export type ExtensionMethods_Microsoft_Extensions_DependencyInjection<TShape> =
 interface __TsonicExtMethods_Microsoft_Extensions_DependencyInjection_Extensions {
   Add(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptor: Microsoft_Extensions_DependencyInjection.ServiceDescriptor): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   Add(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptors: System_Collections_Generic.IEnumerable_1<Microsoft_Extensions_DependencyInjection.ServiceDescriptor>): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  RemoveAll<T>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  RemoveAll<T extends unknown>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   RemoveAll(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  RemoveAllKeyed<T>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
-  RemoveAllKeyed(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  RemoveAllKeyed<T extends unknown>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
+  RemoveAllKeyed(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceType: System.Type, serviceKey: unknown | null): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   Replace(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptor: Microsoft_Extensions_DependencyInjection.ServiceDescriptor): Rewrap<this, Microsoft_Extensions_DependencyInjection.IServiceCollection>;
   TryAdd(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptor: Microsoft_Extensions_DependencyInjection.ServiceDescriptor): Rewrap<this, void>;
   TryAdd(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptors: System_Collections_Generic.IEnumerable_1<Microsoft_Extensions_DependencyInjection.ServiceDescriptor>): Rewrap<this, void>;
   TryAddEnumerable(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptor: Microsoft_Extensions_DependencyInjection.ServiceDescriptor): Rewrap<this, void>;
   TryAddEnumerable(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, descriptors: System_Collections_Generic.IEnumerable_1<Microsoft_Extensions_DependencyInjection.ServiceDescriptor>): Rewrap<this, void>;
-  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, void>;
-  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, void>;
-  TryAddKeyedScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, void>;
-  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, void>;
-  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, void>;
-  TryAddKeyedSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, instance: TService): Rewrap<this, void>;
-  TryAddKeyedSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, void>;
-  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationType: System.Type): Rewrap<this, void>;
-  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, unknown>): Rewrap<this, void>;
-  TryAddKeyedTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown): Rewrap<this, void>;
-  TryAddKeyedTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown, implementationFactory: System.Func_3<System.IServiceProvider, unknown, TService>): Rewrap<this, void>;
+  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, void>;
+  TryAddKeyedScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, void>;
+  TryAddKeyedScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, void>;
+  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, void>;
+  TryAddKeyedSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, void>;
+  TryAddKeyedSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, instance: TService): Rewrap<this, void>;
+  TryAddKeyedSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, void>;
+  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationType: System.Type): Rewrap<this, void>;
+  TryAddKeyedTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, unknown>): Rewrap<this, void>;
+  TryAddKeyedTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null): Rewrap<this, void>;
+  TryAddKeyedTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, serviceKey: unknown | null, implementationFactory: System.Func_3<System.IServiceProvider, unknown | null, TService>): Rewrap<this, void>;
   TryAddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type): Rewrap<this, void>;
   TryAddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationType: System.Type): Rewrap<this, void>;
   TryAddScoped(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, void>;
-  TryAddScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
-  TryAddScoped<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
+  TryAddScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
+  TryAddScoped<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
   TryAddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type): Rewrap<this, void>;
   TryAddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationType: System.Type): Rewrap<this, void>;
   TryAddSingleton(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, void>;
-  TryAddSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
-  TryAddSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, instance: TService): Rewrap<this, void>;
-  TryAddSingleton<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
+  TryAddSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
+  TryAddSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, instance: TService): Rewrap<this, void>;
+  TryAddSingleton<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
   TryAddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type): Rewrap<this, void>;
   TryAddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationType: System.Type): Rewrap<this, void>;
   TryAddTransient(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, service: System.Type, implementationFactory: System.Func_2<System.IServiceProvider, unknown>): Rewrap<this, void>;
-  TryAddTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
-  TryAddTransient<TService>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
+  TryAddTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection): Rewrap<this, void>;
+  TryAddTransient<TService extends (object | null)>(this: Microsoft_Extensions_DependencyInjection.IServiceCollection, implementationFactory: System.Func_2<System.IServiceProvider, TService>): Rewrap<this, void>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.DependencyInjection.Extensions
@@ -428,17 +426,17 @@ export type ExtensionMethods_Microsoft_Extensions_DependencyInjection_Extensions
 interface __TsonicExtMethods_Microsoft_Extensions_Diagnostics_Metrics {
   AddConfiguration(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, configuration: Microsoft_Extensions_Configuration.IConfiguration): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
   AddDebugConsole(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  AddListener<T extends Microsoft_Extensions_Diagnostics_Metrics.IMetricsListener>(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
+  AddListener<T extends (object | null) & Microsoft_Extensions_Diagnostics_Metrics.IMetricsListener>(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
   AddListener(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, listener: Microsoft_Extensions_Diagnostics_Metrics.IMetricsListener): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
   ClearListeners(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string, instrumentName?: string, listenerName?: string, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
-  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string, instrumentName?: string, listenerName?: string, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
-  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string, instrumentName?: string, listenerName?: string, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
-  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
-  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string, instrumentName?: string, listenerName?: string, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
+  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string | null): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
+  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string | null, instrumentName?: string | null, listenerName?: string | null, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
+  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string | null): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
+  DisableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string | null, instrumentName?: string | null, listenerName?: string | null, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
+  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string | null): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
+  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder, meterName: string | null, instrumentName?: string | null, listenerName?: string | null, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.IMetricsBuilder>;
+  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string | null): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
+  EnableMetrics(this: Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions, meterName: string | null, instrumentName?: string | null, listenerName?: string | null, scopes?: Microsoft_Extensions_Diagnostics_Metrics.MeterScope): Rewrap<this, Microsoft_Extensions_Diagnostics_Metrics.MetricsOptions>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.Diagnostics.Metrics
@@ -459,8 +457,8 @@ interface __TsonicExtMethods_Microsoft_Extensions_FileSystemGlobbing {
   GetResultsInFullPath(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, directoryPath: string): Rewrap<this, System_Collections_Generic.IEnumerable_1<System_Internal.String>>;
   Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, file: string): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
   Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, rootDir: string, file: string): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
-  Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, files: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
-  Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, rootDir: string, files: System_Collections_Generic.IEnumerable_1<System_Internal.String>): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
+  Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, files: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
+  Match(this: Microsoft_Extensions_FileSystemGlobbing.Matcher, rootDir: string, files: System_Collections_Generic.IEnumerable_1<System_Internal.String> | null): Rewrap<this, Microsoft_Extensions_FileSystemGlobbing.PatternMatchingResult>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.FileSystemGlobbing
@@ -477,8 +475,8 @@ export type ExtensionMethods_Microsoft_Extensions_FileSystemGlobbing<TShape> =
 // Extension method table for namespace: Microsoft.Extensions.Hosting
 interface __TsonicExtMethods_Microsoft_Extensions_Hosting {
   ConfigureAppConfiguration(this: Microsoft_Extensions_Hosting.IHostBuilder, configureDelegate: System.Action_1<Microsoft_Extensions_Configuration.IConfigurationBuilder>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
-  ConfigureContainer<TContainerBuilder>(this: Microsoft_Extensions_Hosting.IHostBuilder, configureDelegate: System.Action_1<TContainerBuilder>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
-  ConfigureDefaults(this: Microsoft_Extensions_Hosting.IHostBuilder, args: string[]): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
+  ConfigureContainer<TContainerBuilder extends unknown>(this: Microsoft_Extensions_Hosting.IHostBuilder, configureDelegate: System.Action_1<TContainerBuilder>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
+  ConfigureDefaults(this: Microsoft_Extensions_Hosting.IHostBuilder, args: string[] | null): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
   ConfigureHostOptions(this: Microsoft_Extensions_Hosting.IHostBuilder, configureOptions: System.Action_2<Microsoft_Extensions_Hosting.HostBuilderContext, Microsoft_Extensions_Hosting.HostOptions>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
   ConfigureHostOptions(this: Microsoft_Extensions_Hosting.IHostBuilder, configureOptions: System.Action_1<Microsoft_Extensions_Hosting.HostOptions>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
   ConfigureLogging(this: Microsoft_Extensions_Hosting.IHostBuilder, configureLogging: System.Action_2<Microsoft_Extensions_Hosting.HostBuilderContext, Microsoft_Extensions_Logging.ILoggingBuilder>): Rewrap<this, Microsoft_Extensions_Hosting.IHostBuilder>;
@@ -554,8 +552,8 @@ interface __TsonicExtMethods_Microsoft_Extensions_Logging {
   AddConsole(this: Microsoft_Extensions_Logging.ILoggerFactory): Rewrap<this, Microsoft_Extensions_Logging.ILoggerFactory>;
   AddConsole(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddConsole(this: Microsoft_Extensions_Logging.ILoggingBuilder, configure: System.Action_1<Microsoft_Extensions_Logging_Console.ConsoleLoggerOptions>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddConsoleFormatter<TFormatter extends Microsoft_Extensions_Logging_Console.ConsoleFormatter, TOptions extends Microsoft_Extensions_Logging_Console.ConsoleFormatterOptions>(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddConsoleFormatter<TFormatter extends Microsoft_Extensions_Logging_Console.ConsoleFormatter, TOptions extends Microsoft_Extensions_Logging_Console.ConsoleFormatterOptions>(this: Microsoft_Extensions_Logging.ILoggingBuilder, configure: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddConsoleFormatter<TFormatter extends unknown & Microsoft_Extensions_Logging_Console.ConsoleFormatter, TOptions extends unknown & Microsoft_Extensions_Logging_Console.ConsoleFormatterOptions>(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddConsoleFormatter<TFormatter extends unknown & Microsoft_Extensions_Logging_Console.ConsoleFormatter, TOptions extends unknown & Microsoft_Extensions_Logging_Console.ConsoleFormatterOptions>(this: Microsoft_Extensions_Logging.ILoggingBuilder, configure: System.Action_1<TOptions>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddDebug(this: Microsoft_Extensions_Logging.ILoggerFactory, minLevel: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.ILoggerFactory>;
   AddDebug(this: Microsoft_Extensions_Logging.ILoggerFactory, filter: System.Func_3<System_Internal.String, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggerFactory>;
   AddDebug(this: Microsoft_Extensions_Logging.ILoggerFactory): Rewrap<this, Microsoft_Extensions_Logging.ILoggerFactory>;
@@ -568,16 +566,16 @@ interface __TsonicExtMethods_Microsoft_Extensions_Logging {
   AddEventLog(this: Microsoft_Extensions_Logging.ILoggingBuilder, configure: System.Action_1<Microsoft_Extensions_Logging_EventLog.EventLogSettings>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddEventSourceLogger(this: Microsoft_Extensions_Logging.ILoggerFactory): Rewrap<this, Microsoft_Extensions_Logging.ILoggerFactory>;
   AddEventSourceLogger(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, filter: System.Func_4<System_Internal.String, System_Internal.String, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, categoryLevelFilter: System.Func_3<System_Internal.String, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, filter: System.Func_4<string | null, string | null, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, categoryLevelFilter: System.Func_3<string | null, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, category: string, level: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, category: string, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, filter: System.Func_4<System_Internal.String, System_Internal.String, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
-  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, categoryLevelFilter: System.Func_3<System_Internal.String, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
+  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, category: string | null, level: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddFilter(this: Microsoft_Extensions_Logging.ILoggingBuilder, category: string | null, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
+  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, filter: System.Func_4<string | null, string | null, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
+  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, categoryLevelFilter: System.Func_3<string | null, Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
   AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
-  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, category: string, level: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
-  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, category: string, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
+  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, category: string | null, level: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
+  AddFilter(this: Microsoft_Extensions_Logging.LoggerFilterOptions, category: string | null, levelFilter: System.Func_2<Microsoft_Extensions_Logging.LogLevel, System_Internal.Boolean>): Rewrap<this, Microsoft_Extensions_Logging.LoggerFilterOptions>;
   AddJsonConsole(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddJsonConsole(this: Microsoft_Extensions_Logging.ILoggingBuilder, configure: System.Action_1<Microsoft_Extensions_Logging_Console.JsonConsoleFormatterOptions>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddProvider(this: Microsoft_Extensions_Logging.ILoggingBuilder, provider: Microsoft_Extensions_Logging.ILoggerProvider): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
@@ -593,39 +591,39 @@ interface __TsonicExtMethods_Microsoft_Extensions_Logging {
   AddTraceSource(this: Microsoft_Extensions_Logging.ILoggingBuilder, switchName: string, listener: System_Diagnostics.TraceListener): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddTraceSource(this: Microsoft_Extensions_Logging.ILoggingBuilder, sourceSwitch: System_Diagnostics.SourceSwitch): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   AddTraceSource(this: Microsoft_Extensions_Logging.ILoggingBuilder, sourceSwitch: System_Diagnostics.SourceSwitch, listener: System_Diagnostics.TraceListener): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  BeginScope(this: Microsoft_Extensions_Logging.ILogger, messageFormat: string, ...args: unknown[]): Rewrap<this, System.IDisposable | undefined>;
+  BeginScope(this: Microsoft_Extensions_Logging.ILogger, messageFormat: string, ...args: (unknown | null)[]): Rewrap<this, System.IDisposable | null>;
   ClearProviders(this: Microsoft_Extensions_Logging.ILoggingBuilder): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
   Configure(this: Microsoft_Extensions_Logging.ILoggingBuilder, action: System.Action_1<Microsoft_Extensions_Logging.LoggerFactoryOptions>): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
-  CreateLogger<T>(this: Microsoft_Extensions_Logging.ILoggerFactory): Rewrap<this, Microsoft_Extensions_Logging.ILogger_1<T>>;
+  CreateLogger<T extends unknown>(this: Microsoft_Extensions_Logging.ILoggerFactory): Rewrap<this, Microsoft_Extensions_Logging.ILogger_1<T>>;
   CreateLogger(this: Microsoft_Extensions_Logging.ILoggerFactory, type: System.Type): Rewrap<this, Microsoft_Extensions_Logging.ILogger>;
-  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, message: string, ...args: unknown[]): Rewrap<this, void>;
-  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogCritical(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogCritical(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogCritical(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogCritical(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogDebug(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogDebug(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogDebug(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogDebug(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogError(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogError(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogError(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogError(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogInformation(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogInformation(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogInformation(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogInformation(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogTrace(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogTrace(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogTrace(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogTrace(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogWarning(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogWarning(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogWarning(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception, message: string, ...args: unknown[]): Rewrap<this, void>;
-  LogWarning(this: Microsoft_Extensions_Logging.ILogger, message: string, ...args: unknown[]): Rewrap<this, void>;
+  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  Log(this: Microsoft_Extensions_Logging.ILogger, logLevel: Microsoft_Extensions_Logging.LogLevel, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogCritical(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogCritical(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogCritical(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogCritical(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogDebug(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogDebug(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogDebug(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogDebug(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogError(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogError(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogError(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogError(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogInformation(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogInformation(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogInformation(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogInformation(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogTrace(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogTrace(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogTrace(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogTrace(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogWarning(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogWarning(this: Microsoft_Extensions_Logging.ILogger, eventId: Microsoft_Extensions_Logging.EventId, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogWarning(this: Microsoft_Extensions_Logging.ILogger, exception: System.Exception | null, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
+  LogWarning(this: Microsoft_Extensions_Logging.ILogger, message: string | null, ...args: (unknown | null)[]): Rewrap<this, void>;
   SetMinimumLevel(this: Microsoft_Extensions_Logging.ILoggingBuilder, level: Microsoft_Extensions_Logging.LogLevel): Rewrap<this, Microsoft_Extensions_Logging.ILoggingBuilder>;
 }
 
@@ -675,7 +673,7 @@ export type ExtensionMethods_Microsoft_Extensions_ObjectPool<TShape> =
 
 // Extension method table for namespace: Microsoft.Extensions.Options
 interface __TsonicExtMethods_Microsoft_Extensions_Options {
-  OnChange<TOptions>(this: Microsoft_Extensions_Options.IOptionsMonitor_1<TOptions>, listener: System.Action_1<TOptions>): Rewrap<this, System.IDisposable | undefined>;
+  OnChange<TOptions extends unknown>(this: Microsoft_Extensions_Options.IOptionsMonitor_1<TOptions>, listener: System.Action_1<TOptions>): Rewrap<this, System.IDisposable | null>;
 }
 
 // Generic helper type for extension methods in namespace: Microsoft.Extensions.Options