Rename DCP command-line args.

src/Aspire.Hosting/Dcp/DcpOptions.cs

@@ -111,6 +111,7 @@ internal class ConfigureDefaultDcpOptions(
     public void Configure(DcpOptions options)
     {
         var dcpPublisherConfiguration = configuration.GetSection(DcpPublisher);
+        var assemblyMetadata = appOptions.Assembly?.GetCustomAttributes<AssemblyMetadataAttribute>();
 
         if (!string.IsNullOrEmpty(dcpPublisherConfiguration[nameof(options.CliPath)]))
         {
@@ -119,10 +120,18 @@ public void Configure(DcpOptions options)
         }
         else
         {
-            var assemblyMetadata = appOptions.Assembly?.GetCustomAttributes<AssemblyMetadataAttribute>();
             options.CliPath = GetMetadataValue(assemblyMetadata, DcpCliPathMetadataKey);
             options.ExtensionsPath = GetMetadataValue(assemblyMetadata, DcpExtensionsPathMetadataKey);
             options.BinPath = GetMetadataValue(assemblyMetadata, DcpBinPathMetadataKey);
+        }
+
+        if (!string.IsNullOrEmpty(dcpPublisherConfiguration[nameof(options.DashboardPath)]))
+        {
+            // If an explicit path to DCP was provided from configuration, don't try to resolve via assembly attributes
+            options.DashboardPath = dcpPublisherConfiguration[nameof(options.DashboardPath)];
+        }
+        else
+        {
             options.DashboardPath = GetMetadataValue(assemblyMetadata, DashboardPathMetadataKey);
         }
 
@@ -143,7 +152,7 @@ public void Configure(DcpOptions options)
             }
             else
             {
-                throw new InvalidOperationException($"Invalid value \"{dcpPublisherConfiguration[nameof(options.DependencyCheckTimeout)]}\" for \"--dependency-check-timeout\". Exepcted an integer value.");
+                throw new InvalidOperationException($"Invalid value \"{dcpPublisherConfiguration[nameof(options.DependencyCheckTimeout)]}\" for \"--dcp-dependency-check-timeout\". Expected an integer value.");
             }
         }
         else

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -260,8 +260,9 @@ private void ConfigurePublishingOptions(DistributedApplicationOptions options)
             { "--publisher", "Publishing:Publisher" },
             { "--output-path", "Publishing:OutputPath" },
             { "--dcp-cli-path", "DcpPublisher:CliPath" },
-            { "--container-runtime", "DcpPublisher:ContainerRuntime" },
-            { "--dependency-check-timeout", "DcpPublisher:DependencyCheckTimeout" },
+            { "--dcp-container-runtime", "DcpPublisher:ContainerRuntime" },
+            { "--dcp-dependency-check-timeout", "DcpPublisher:DependencyCheckTimeout" },
+            { "--dcp-dashboard-path", "DcpPublisher:DashboardPath" },
         };
         _innerBuilder.Configuration.AddCommandLine(options.Args ?? [], switchMappings);
         _innerBuilder.Services.Configure<PublishingOptions>(_innerBuilder.Configuration.GetSection(PublishingOptions.Publishing));

tests/Aspire.Hosting.Tests/Dcp/DcpCliArgsTests.cs

@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Aspire.Hosting.Dcp;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Xunit;
+
+namespace Aspire.Hosting.Tests.Dcp;
+
+public class DcpCliArgsTests
+{
+    [Fact]
+    public void TestDcpCliPathArgumentPopulatesConfig()
+    {
+        var builder = DistributedApplication.CreateBuilder([
+            "--dcp-cli-path", "/not/a/valid/path",
+            ]);
+
+        Assert.Equal("/not/a/valid/path", builder.Configuration["DcpPublisher:CliPath"]);
+    }
+
+    [Fact]
+    public void TestDcpDependencyCheckTimeoutPopulatesConfig()
+    {
+        var builder = DistributedApplication.CreateBuilder([
+            "--dcp-dependency-check-timeout", "42",
+            ]);
+
+        Assert.Equal("42", builder.Configuration["DcpPublisher:DependencyCheckTimeout"]);
+    }
+
+    [Fact]
+    public void TestDcpContainerRuntimePopulatesConfig()
+    {
+        var builder = DistributedApplication.CreateBuilder([
+            "--dcp-container-runtime", "not-a-valid-container-runtime",
+            ]);
+
+        Assert.Equal("not-a-valid-container-runtime", builder.Configuration["DcpPublisher:ContainerRuntime"]);
+    }
+
+    [Fact]
+    public void TestDcpOptionsPopulated()
+    {
+        var builder = DistributedApplication.CreateBuilder(
+            [
+            "--dcp-cli-path", "/not/a/valid/path",
+            "--dcp-container-runtime", "not-a-valid-container-runtime",
+            "--dcp-dependency-check-timeout", "42",
+            "--dcp-dashboard-path", "/not/a/valid/path"
+            ]);
+
+        using var app = builder.Build();
+        var dcpOptions = app.Services.GetRequiredService<IOptions<DcpOptions>>().Value;
+
+        Assert.Equal("not-a-valid-container-runtime", dcpOptions.ContainerRuntime);
+        Assert.Equal(42, dcpOptions.DependencyCheckTimeout);
+        Assert.Equal("/not/a/valid/path", dcpOptions.CliPath);
+        Assert.Equal("/not/a/valid/path", dcpOptions.DashboardPath);
+    }
+}