Register IPipelineOutputService in DI for pipeline output directory management

src/Aspire.Cli/Commands/PublishCommand.cs

@@ -49,11 +49,10 @@ protected override string[] GetRunArguments(string? fullyQualifiedOutputPath, st
     {
         var baseArgs = new List<string> { "--operation", "publish", "--step", "publish" };
 
-        var targetPath = fullyQualifiedOutputPath is not null
-            ? fullyQualifiedOutputPath
-            : Path.Combine(Environment.CurrentDirectory, "aspire-output");
-
-        baseArgs.AddRange(["--output-path", targetPath]);
+        if (fullyQualifiedOutputPath is not null)
+        {
+            baseArgs.AddRange(["--output-path", fullyQualifiedOutputPath]);
+        }
 
         // Add --log-level and --envionment flags if specified
         var logLevel = parseResult.GetValue(_logLevelOption);

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.OutputPath ?? throw new InvalidOperationException("OutputPath is required for Azure publishing."),
+            outputService.GetOutputDirectory(),
             azureProvisioningOptions.Value,
             context.Services,
             context.Logger,

src/Aspire.Hosting.Docker/DockerComposePublishingContext.cs

@@ -37,7 +37,7 @@ internal sealed class DockerComposePublishingContext(
         UnixFileMode.OtherRead | UnixFileMode.OtherWrite;
 
     public readonly IResourceContainerImageBuilder ImageBuilder = imageBuilder;
-    public readonly string OutputPath = outputPath ?? throw new InvalidOperationException("OutputPath is required for Docker Compose publishing.");
+    public readonly string OutputPath = outputPath;
 
     internal async Task WriteModelAsync(DistributedApplicationModel model, DockerComposeEnvironmentResource environment)
     {

src/Aspire.Hosting.Kubernetes/KubernetesPublishingContext.cs

@@ -20,7 +20,7 @@ internal sealed class KubernetesPublishingContext(
     ILogger logger,
     CancellationToken cancellationToken = default)
 {
-    public readonly string OutputPath = outputPath ?? throw new InvalidOperationException("OutputPath is required for Kubernetes publishing.");
+    public readonly string OutputPath = outputPath;
 
     private readonly Dictionary<string, Dictionary<string, object>> _helmValues = new()
     {

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -462,6 +462,7 @@ 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, PipelineOutputService>();
         _innerBuilder.Services.AddSingleton(Pipeline);
 
         // Configure pipeline logging options

src/Aspire.Hosting/Pipelines/IPipelineOutputService.cs

@@ -0,0 +1,40 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Aspire.Hosting.ApplicationModel;
+
+namespace Aspire.Hosting.Pipelines;
+
+/// <summary>
+/// Service for managing pipeline output directories.
+/// </summary>
+[Experimental("ASPIREPIPELINES001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
+public interface IPipelineOutputService
+{
+    /// <summary>
+    /// Gets the output directory for deployment artifacts.
+    /// </summary>
+    /// <returns>The path to the output directory for deployment artifacts.</returns>
+    string GetOutputDirectory();
+
+    /// <summary>
+    /// Gets the output directory for a specific resource's deployment artifacts.
+    /// </summary>
+    /// <param name="resource">The resource to get the output directory for.</param>
+    /// <returns>The path to the output directory for the resource's deployment artifacts.</returns>
+    string GetOutputDirectory(IResource resource);
+
+    /// <summary>
+    /// Gets a temporary directory for build artifacts.
+    /// </summary>
+    /// <returns>The path to a temporary directory for build artifacts.</returns>
+    string GetTempDirectory();
+
+    /// <summary>
+    /// Gets a temporary directory for a specific resource's build artifacts.
+    /// </summary>
+    /// <param name="resource">The resource to get the temporary directory for.</param>
+    /// <returns>The path to a temporary directory for the resource's build artifacts.</returns>
+    string GetTempDirectory(IResource resource);
+}

src/Aspire.Hosting/Pipelines/PipelineContext.cs

@@ -15,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.
@@ -49,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 output path for deployment artifacts.
-    /// </summary>
-    public string? OutputPath { get; } = outputPath;
 }

src/Aspire.Hosting/Pipelines/PipelineOutputService.cs

@@ -0,0 +1,68 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics.CodeAnalysis;
+using Aspire.Hosting.ApplicationModel;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Options;
+
+namespace Aspire.Hosting.Pipelines;
+
+/// <summary>
+/// Default implementation of <see cref="IPipelineOutputService"/>.
+/// </summary>
+[Experimental("ASPIREPIPELINES001", UrlFormat = "https://aka.ms/aspire/diagnostics/{0}")]
+internal sealed class PipelineOutputService : IPipelineOutputService
+{
+    private readonly string? _outputPath;
+    private readonly Lazy<string> _tempDirectory;
+
+    public PipelineOutputService(IOptions<PipelineOptions> options, IConfiguration configuration)
+    {
+        _outputPath = options.Value.OutputPath is not null ? Path.GetFullPath(options.Value.OutputPath) : null;
+        _tempDirectory = new Lazy<string>(() => CreateTempDirectory(configuration));
+    }
+
+    /// <inheritdoc/>
+    public string GetOutputDirectory()
+    {
+        return _outputPath ?? Path.Combine(Environment.CurrentDirectory, "aspire-output");
+    }
+
+    /// <inheritdoc/>
+    public string GetOutputDirectory(IResource resource)
+    {
+        ArgumentNullException.ThrowIfNull(resource);
+
+        var baseOutputDir = GetOutputDirectory();
+        return Path.Combine(baseOutputDir, resource.Name);
+    }
+
+    /// <inheritdoc/>
+    public string GetTempDirectory()
+    {
+        return _tempDirectory.Value;
+    }
+
+    /// <inheritdoc/>
+    public string GetTempDirectory(IResource resource)
+    {
+        ArgumentNullException.ThrowIfNull(resource);
+
+        var baseTempDir = GetTempDirectory();
+        return Path.Combine(baseTempDir, resource.Name);
+    }
+
+    private static string CreateTempDirectory(IConfiguration configuration)
+    {
+        var appHostSha = configuration["AppHost:PathSha256"];
+
+        if (!string.IsNullOrEmpty(appHostSha))
+        {
+            return Directory.CreateTempSubdirectory($"aspire-{appHostSha}").FullName;
+        }
+
+        // Fallback if AppHost:PathSha256 is not available
+        return Directory.CreateTempSubdirectory("aspire").FullName;
+    }
+}

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 output path for deployment artifacts.
-    /// </summary>
-    public string? OutputPath => PipelineContext.OutputPath;
 }

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,22 @@
 
 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.OutputPath!, environment.Name);
+            // If there are multiple compute environments, use resource-specific output path
+            return outputService.GetOutputDirectory(environment);
         }
 
         // If there is only one compute environment, use the root output path
-        return context.OutputPath!;
+        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.OutputPath ?? "aspire-manifest.json";
+                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]