Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/ConsoleAppFramework/Emitter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ public void EmitAsConsoleAppBuilder(SourceBuilder sb, DllReference dllReference)
internal static class ConsoleAppHostBuilderExtensions
{
class CompositeDisposableServiceProvider(IDisposable host, IServiceProvider serviceServiceProvider, IDisposable scope, IServiceProvider serviceProvider)
: IServiceProvider, IKeyedServiceProvider, IDisposable
: IServiceProvider, IKeyedServiceProvider, IDisposable, IAsyncDisposable
{
public object? GetService(Type serviceType)
{
Expand Down Expand Up @@ -868,6 +868,25 @@ public void Dispose()
}
host.Dispose();
}

public async ValueTask DisposeAsync()
{
await CastAndDispose(host);
await CastAndDispose(scope);
await CastAndDispose(serviceProvider);
await CastAndDispose(serviceServiceProvider);
GC.SuppressFinalize(this);

return;

static async ValueTask CastAndDispose<T>(T resource)
{
if (resource is IAsyncDisposable resourceAsyncDisposable)
await resourceAsyncDisposable.DisposeAsync();
else if (resource is IDisposable resourceDisposable)
resourceDisposable.Dispose();
}
}
}

internal static ConsoleApp.ConsoleAppBuilder ToConsoleAppBuilder(this IHostBuilder hostBuilder)
Expand Down