Refactor Dapr to use IDistributedApplicationEventingSubscriber

Co-authored-by: aaronpowell <434140+aaronpowell@users.noreply.github.com>

Author: Copilot

src/CommunityToolkit.Aspire.Hosting.Dapr/DaprDistributedApplicationLifecycleHook.cs

@@ -4,6 +4,7 @@
 using Aspire.Hosting;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Eventing;
+using Aspire.Hosting.Lifecycle;
 using Aspire.Hosting.Utils;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -22,14 +23,22 @@ internal sealed class DaprDistributedApplicationLifecycleHook(
     IConfiguration configuration,
     IHostEnvironment environment,
     ILogger<DaprDistributedApplicationLifecycleHook> logger,
-    IOptions<DaprOptions> options) : IDisposable
+    IOptions<DaprOptions> options,
+    DistributedApplicationExecutionContext executionContext) : IDistributedApplicationEventingSubscriber, IDisposable
 {
     private readonly DaprOptions _options = options.Value;
 
     private string? _onDemandResourcesRootPath;
 
-    public async Task BeforeStartAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
+    public Task SubscribeAsync(IDistributedApplicationEventing eventing, DistributedApplicationExecutionContext executionContext, CancellationToken cancellationToken)
     {
+        eventing.Subscribe<BeforeStartEvent>(OnBeforeStartAsync);
+        return Task.CompletedTask;
+    }
+
+    private async Task OnBeforeStartAsync(BeforeStartEvent @event, CancellationToken cancellationToken = default)
+    {
+        var appModel = @event.Model;
         string appHostDirectory = GetAppHostDirectory();
 
         // Set up WaitAnnotations for Dapr components based on their value provider dependencies

src/CommunityToolkit.Aspire.Hosting.Dapr/IDistributedApplicationBuilderExtensions.cs

@@ -2,15 +2,12 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Aspire.Hosting.ApplicationModel;
-using Aspire.Hosting.Eventing;
+using Aspire.Hosting.Lifecycle;
 using Aspire.Hosting.Publishing;
 using Aspire.Hosting.Utils;
 using CommunityToolkit.Aspire.Hosting.Dapr;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Aspire.Hosting;
 
@@ -33,16 +30,7 @@ public static IDistributedApplicationBuilder AddDapr(this IDistributedApplicatio
             builder.Services.Configure(configure);
         }
 
-        builder.Eventing.Subscribe<BeforeStartEvent>(async (evt, ct) =>
-        {
-            var hook = new DaprDistributedApplicationLifecycleHook(
-                evt.Services.GetRequiredService<IConfiguration>(),
-                evt.Services.GetRequiredService<IHostEnvironment>(),
-                evt.Services.GetRequiredService<ILogger<DaprDistributedApplicationLifecycleHook>>(),
-                evt.Services.GetRequiredService<IOptions<DaprOptions>>());
-
-            await hook.BeforeStartAsync(evt.Model, ct).ConfigureAwait(false);
-        });
+        builder.Services.TryAddEventingSubscriber<DaprDistributedApplicationLifecycleHook>();
 
         return builder;
     }