Remove OutputService from PipelineContext and resolve from DI

- Register IPipelineOutputService in DI container with PipelineOptions
- Remove OutputService property from PipelineContext and PipelineStepContext
- Remove outputPath parameter from PipelineContext constructor
- Update all consumers to resolve IPipelineOutputService from Services
  - AzureEnvironmentResource
  - PublishingContextUtils
  - JsonDocumentManifestPublisher test helper
- Remove IOptions<PipelineOptions> dependency from PipelineExecutor
- Steps now explicitly resolve IPipelineOutputService when needed

Co-authored-by: davidfowl <[email protected]>

Author: Copilot

src/Aspire.Hosting.Azure/AzureEnvironmentResource.cs

@@ -121,8 +121,9 @@ public AzureEnvironmentResource(string name, ParameterResource location, Paramet
     private Task PublishAsync(PipelineStepContext context)
     {
         var azureProvisioningOptions = context.Services.GetRequiredService<IOptions<AzureProvisioningOptions>>();
+        var outputService = context.Services.GetRequiredService<IPipelineOutputService>();
         var publishingContext = new AzurePublishingContext(
-            context.OutputService.GetOutputDirectory(),
+            outputService.GetOutputDirectory(),
             azureProvisioningOptions.Value,
             context.Services,
             context.Logger,

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -462,6 +462,13 @@ public DistributedApplicationBuilder(DistributedApplicationOptions options)
         _innerBuilder.Services.AddSingleton<IResourceContainerImageBuilder, ResourceContainerImageBuilder>();
         _innerBuilder.Services.AddSingleton<PipelineActivityReporter>();
         _innerBuilder.Services.AddSingleton<IPipelineActivityReporter, PipelineActivityReporter>(sp => sp.GetRequiredService<PipelineActivityReporter>());
+        _innerBuilder.Services.AddSingleton<IPipelineOutputService>(sp =>
+        {
+            var options = sp.GetRequiredService<IOptions<PipelineOptions>>();
+            var configuration = sp.GetRequiredService<IConfiguration>();
+            var outputPath = options.Value.OutputPath is not null ? Path.GetFullPath(options.Value.OutputPath) : null;
+            return new PipelineOutputService(outputPath, configuration);
+        });
         _innerBuilder.Services.AddSingleton(Pipeline);
 
         // Configure pipeline logging options

src/Aspire.Hosting/Pipelines/PipelineContext.cs

@@ -3,8 +3,6 @@
 
 using System.Diagnostics.CodeAnalysis;
 using Aspire.Hosting.ApplicationModel;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
 namespace Aspire.Hosting.Pipelines;
@@ -17,15 +15,13 @@ namespace Aspire.Hosting.Pipelines;
 /// <param name="serviceProvider">The service provider for dependency resolution.</param>
 /// <param name="logger">The logger for pipeline operations.</param>
 /// <param name="cancellationToken">The cancellation token for the pipeline operation.</param>
-/// <param name="outputPath">The output path for deployment artifacts.</param>
 [Experimental("ASPIREPIPELINES001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
 public sealed class PipelineContext(
     DistributedApplicationModel model,
     DistributedApplicationExecutionContext executionContext,
     IServiceProvider serviceProvider,
     ILogger logger,
-    CancellationToken cancellationToken,
-    string? outputPath)
+    CancellationToken cancellationToken)
 {
     /// <summary>
     /// Gets the distributed application model to be deployed.
@@ -51,9 +47,4 @@ public sealed class PipelineContext(
     /// Gets the cancellation token for the pipeline operation.
     /// </summary>
     public CancellationToken CancellationToken { get; set; } = cancellationToken;
-
-    /// <summary>
-    /// Gets the service for managing pipeline output directories.
-    /// </summary>
-    public IPipelineOutputService OutputService { get; } = new PipelineOutputService(outputPath, serviceProvider.GetRequiredService<IConfiguration>());
 }

src/Aspire.Hosting/Pipelines/PipelineStepContext.cs

@@ -54,9 +54,4 @@ public sealed class PipelineStepContext
     /// Gets the cancellation token for the pipeline operation.
     /// </summary>
     public CancellationToken CancellationToken => PipelineContext.CancellationToken;
-
-    /// <summary>
-    /// Gets the service for managing pipeline output directories.
-    /// </summary>
-    public IPipelineOutputService OutputService => PipelineContext.OutputService;
 }

src/Aspire.Hosting/Publishing/PipelineExecutor.cs

@@ -12,7 +12,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Aspire.Hosting.Publishing;
 
@@ -25,7 +24,6 @@ internal sealed class PipelineExecutor(
     IPipelineActivityReporter activityReporter,
     IDistributedApplicationEventing eventing,
     BackchannelService backchannelService,
-    IOptions<PipelineOptions> options,
     IPipelineActivityReporter pipelineActivityReporter) : BackgroundService
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -99,8 +97,7 @@ await eventing.PublishAsync<AfterPublishEvent>(
 
     public async Task ExecutePipelineAsync(DistributedApplicationModel model, CancellationToken cancellationToken)
     {
-        var pipelineContext = new PipelineContext(model, executionContext, serviceProvider, logger, cancellationToken, options.Value.OutputPath is not null ?
-            Path.GetFullPath(options.Value.OutputPath) : null);
+        var pipelineContext = new PipelineContext(model, executionContext, serviceProvider, logger, cancellationToken);
 
         var pipeline = serviceProvider.GetRequiredService<IDistributedApplicationPipeline>();
         await pipeline.ExecuteAsync(pipelineContext).ConfigureAwait(false);

src/Shared/PublishingContextUtils.cs

@@ -5,20 +5,23 @@
 
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Pipelines;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Aspire.Hosting.Utils;
 
 internal static class PublishingContextUtils
 {
     public static string GetEnvironmentOutputPath(PipelineStepContext context, IComputeEnvironmentResource environment)
     {
+        var outputService = context.Services.GetRequiredService<IPipelineOutputService>();
+        
         if (context.Model.Resources.OfType<IComputeEnvironmentResource>().Count() > 1)
         {
             // If there are multiple compute environments, append the environment name to the output path
-            return Path.Combine(context.OutputService.GetOutputDirectory(), environment.Name);
+            return Path.Combine(outputService.GetOutputDirectory(), environment.Name);
         }
 
         // If there is only one compute environment, use the root output path
-        return context.OutputService.GetOutputDirectory();
+        return outputService.GetOutputDirectory();
     }
 }

tests/Aspire.Hosting.Tests/Helpers/JsonDocumentManifestPublisher.cs

@@ -78,7 +78,8 @@ public static IDistributedApplicationPipeline AddJsonDocumentManifestPublishing(
                 using var stream = new MemoryStream();
                 using var writer = new Utf8JsonWriter(stream, new() { Indented = true });
 
-                var manifestPath = context.OutputService.GetOutputDirectory();
+                var outputService = context.Services.GetRequiredService<IPipelineOutputService>();
+                var manifestPath = outputService.GetOutputDirectory();
                 var publishingContext = new ManifestPublishingContext(executionContext, manifestPath, writer, context.CancellationToken);
 
                 await publishingContext.WriteModel(context.Model, context.CancellationToken).ConfigureAwait(false);

tests/Aspire.Hosting.Tests/Pipelines/DistributedApplicationPipelineTests.cs

@@ -876,8 +876,7 @@ private static PipelineContext CreateDeployingContext(DistributedApplication app
             app.Services.GetRequiredService<DistributedApplicationExecutionContext>(),
             app.Services,
             NullLogger.Instance,
-            CancellationToken.None,
-            outputPath: null);
+            CancellationToken.None);
     }
 
     [Fact]