Updated Aspire (9.4.1 -> 13.0.2) (#8970)

Author: glen-84

src/Directory.Packages.props

@@ -4,12 +4,9 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AlterNats.Hosting" Version="1.0.6" />
-    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.4.1" />
-    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.4.1" />
-    <PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="9.4.1" />
-    <PackageVersion Include="Aspire.Hosting.Redis" Version="9.4.1" />
-    <PackageVersion Include="Aspire.Hosting" Version="9.4.1" />
-    <PackageVersion Include="Aspire.AppHost.Sdk" Version="1.9.0" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.2" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="13.0.2" />
+    <PackageVersion Include="Aspire.Hosting" Version="13.0.2" />
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.3" />
     <PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.3" />

src/HotChocolate/AspNetCore/benchmarks/k6/Catalog.AppHost/eShop.Catalog.AppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Sdk Name="Aspire.AppHost.Sdk" Version="9.4.1" />
+  <Sdk Name="Aspire.AppHost.Sdk" Version="13.0.2" />
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>

src/HotChocolate/Fusion-vnext/src/Fusion.Aspire/GraphQLOrchestratorExtensions.cs

@@ -16,7 +16,7 @@ public static class GraphQLOrchestratorExtensions
     public static IDistributedApplicationBuilder AddGraphQLOrchestrator(
         this IDistributedApplicationBuilder builder)
     {
-        builder.Services.AddLifecycleHook<SchemaComposition>();
+        builder.Services.AddEventingSubscriber<SchemaComposition>();
         return builder;
     }
 }

src/HotChocolate/Fusion-vnext/src/Fusion.Aspire/SchemaComposition.cs

@@ -2,6 +2,7 @@
 using System.Text.Json;
 using Aspire.Hosting;
 using Aspire.Hosting.ApplicationModel;
+using Aspire.Hosting.Eventing;
 using Aspire.Hosting.Lifecycle;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
@@ -11,47 +12,54 @@ namespace HotChocolate.Fusion.Aspire;
 internal sealed class SchemaComposition(
     IHostApplicationLifetime lifetime,
     ILogger<SchemaComposition> logger)
-    : IDistributedApplicationLifecycleHook
+    : IDistributedApplicationEventingSubscriber
 {
-    public async Task AfterResourcesCreatedAsync(
-        DistributedApplicationModel appModel,
-        CancellationToken cancellationToken = default)
+    public Task SubscribeAsync(
+        IDistributedApplicationEventing eventing,
+        DistributedApplicationExecutionContext executionContext,
+        CancellationToken cancellationToken)
     {
-        var compositionFailed = false;
-
-        try
+        eventing.Subscribe<BeforeStartEvent>(async (@event, ct) =>
         {
-            // Find all resources that need schema composition
-            var compositionResources = appModel.GetGraphQLCompositionResources().ToList();
+            var model = @event.Model;
+            var compositionFailed = false;
 
-            if (compositionResources.Count == 0)
+            try
             {
-                logger.LogDebug("No resources found that need GraphQL schema composition");
-                return;
-            }
+                // Find all resources that need schema composition
+                var compositionResources = model.GetGraphQLCompositionResources().ToList();
 
-            logger.LogInformation("Starting GraphQL schema composition...");
+                if (compositionResources.Count == 0)
+                {
+                    logger.LogDebug("No resources found that need GraphQL schema composition");
+                    return;
+                }
 
-            // Process each composition resource
-            foreach (var compositionResource in compositionResources)
-            {
-                if (!await ComposeSchemaAsync(compositionResource, appModel, cancellationToken))
+                logger.LogInformation("Starting GraphQL schema composition...");
+
+                // Process each composition resource
+                foreach (var compositionResource in compositionResources)
                 {
-                    compositionFailed = true;
+                    if (!await ComposeSchemaAsync(compositionResource, model, ct))
+                    {
+                        compositionFailed = true;
+                    }
                 }
             }
-        }
-        catch
-        {
-            compositionFailed = true;
-        }
+            catch
+            {
+                compositionFailed = true;
+            }
 
-        if (compositionFailed)
-        {
-            logger.LogCritical("GraphQL schema composition failed - stopping application");
-            lifetime.StopApplication();
-            throw new InvalidOperationException("GraphQL schema composition failed");
-        }
+            if (compositionFailed)
+            {
+                logger.LogCritical("GraphQL schema composition failed - stopping application");
+                lifetime.StopApplication();
+                throw new InvalidOperationException("GraphQL schema composition failed");
+            }
+        });
+
+        return Task.CompletedTask;
     }
 
     private async Task<bool> ComposeSchemaAsync(