PR follow up changes (#1090)

- Remove AssemblyName and AssemblyPath from IServiceMetadata
- Make the app host directory available to the app via config

Author: davidfowl

src/Aspire.Hosting/DistributedApplicationBuilder.cs

@@ -29,7 +29,7 @@ public class DistributedApplicationBuilder : IDistributedApplicationBuilder
     public IServiceCollection Services => _innerBuilder.Services;
 
     /// <inheritdoc />
-    public string ProjectDirectory { get; }
+    public string AppHostDirectory { get; }
 
     /// <inheritdoc />
     public IResourceCollection Resources { get; } = new ResourceCollection();
@@ -43,7 +43,13 @@ public DistributedApplicationBuilder(DistributedApplicationOptions options)
         _args = options.Args ?? [];
         _innerBuilder = new HostApplicationBuilder();
 
-        ProjectDirectory = options.ProjectDirectory ?? _innerBuilder.Environment.ContentRootPath;
+        AppHostDirectory = options.ProjectDirectory ?? _innerBuilder.Environment.ContentRootPath;
+
+        // Make the app host directory available to the application via configuration
+        _innerBuilder.Configuration.AddInMemoryCollection(new Dictionary<string, string?>
+        {
+            ["AppHost:Directory"] = AppHostDirectory
+        });
 
         // Core things
         _innerBuilder.Services.AddSingleton(sp => new DistributedApplicationModel(Resources));

src/Aspire.Hosting/Extensions/ExecutableResourceBuilderExtensions.cs

@@ -23,7 +23,7 @@ public static class ExecutableResourceBuilderExtensions
     /// <returns>The <see cref="IResourceBuilder{ExecutableResource}"/>.</returns>
     public static IResourceBuilder<ExecutableResource> AddExecutable(this IDistributedApplicationBuilder builder, string name, string command, string workingDirectory, params string[]? args)
     {
-        workingDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.ProjectDirectory, workingDirectory));
+        workingDirectory = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.AppHostDirectory, workingDirectory));
 
         var executable = new ExecutableResource(name, command, workingDirectory, args);
         return builder.AddResource(executable);

src/Aspire.Hosting/Extensions/ProjectResourceBuilderExtensions.cs

@@ -41,7 +41,7 @@ public static IResourceBuilder<ProjectResource> AddProject(this IDistributedAppl
     {
         var project = new ProjectResource(name);
 
-        projectPath = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.ProjectDirectory, projectPath));
+        projectPath = PathNormalizer.NormalizePathForCurrentPlatform(Path.Combine(builder.AppHostDirectory, projectPath));
 
         return builder.AddResource(project)
                       .WithProjectDefaults()

src/Aspire.Hosting/IDistributedApplicationBuilder.cs

@@ -19,7 +19,7 @@ public interface IDistributedApplicationBuilder
     /// <summary>
     /// Directory of the project where the app host is located. Defaults to the content root if there's no project.
     /// </summary>
-    public string ProjectDirectory { get; }
+    public string AppHostDirectory { get; }
 
     /// <inheritdoc cref="HostApplicationBuilder.Environment" />
     public IHostEnvironment Environment { get; }

src/Aspire.Hosting/IServiceMetadata.cs

@@ -10,16 +10,6 @@ namespace Aspire.Hosting;
 /// </summary>
 public interface IServiceMetadata : IResourceAnnotation
 {
-    /// <summary>
-    /// Gets the name of the assembly containing the service.
-    /// </summary>
-    public string AssemblyName { get; }
-
-    /// <summary>
-    /// Gets the fully-qualified path to the assembly containing the service.
-    /// </summary>
-    public string AssemblyPath { get; }
-
     /// <summary>
     /// Gets the fully-qualified path to the project containing the service.
     /// </summary>
@@ -28,9 +18,5 @@ public interface IServiceMetadata : IResourceAnnotation
 
 internal class ServiceMetadata(string projectPath) : IServiceMetadata
 {
-    public string AssemblyName => throw new NotImplementedException();
-
-    public string AssemblyPath => throw new NotImplementedException();
-
     public string ProjectPath { get; } = projectPath;
 }

src/Aspire.Hosting/build/Aspire.Hosting.targets

@@ -38,8 +38,6 @@ namespace ]]>%(Namespace)<![CDATA[%3B
 
 public class ]]>%(ClassName)<![CDATA[ : IServiceMetadata
 {
-  public string AssemblyName => """]]>%(AssemblyName)<![CDATA["""%3B
-  public string AssemblyPath => """]]>%(Identity)<![CDATA["""%3B
   public string ProjectPath => """]]>%(ProjectPath)<![CDATA["""%3B
 }]]>
         </Source>

tests/Aspire.Hosting.Tests/DistributedApplicationBuilderTests.cs

@@ -3,6 +3,7 @@
 
 using Aspire.Hosting.Lifecycle;
 using Aspire.Hosting.Publishing;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Xunit;
@@ -83,6 +84,17 @@ public void BuilderConfiguresPublishingOptionsFromConfig()
         Assert.Equal("/path/", publishOptions.Value.OutputPath);
     }
 
+    [Fact]
+    public void AppHostDirectoryAvailableViaConfig()
+    {
+        var appBuilder = DistributedApplication.CreateBuilder();
+        var appHostDirectory = appBuilder.AppHostDirectory;
+        var app = appBuilder.Build();
+
+        var config = app.Services.GetRequiredService<IConfiguration>();
+        Assert.Equal(appHostDirectory, config["AppHost:Directory"]);
+    }
+
     private sealed class TestResource : IResource
     {
         public string Name => throw new NotImplementedException();

tests/Aspire.Hosting.Tests/ProjectResourceTests.cs

@@ -161,10 +161,6 @@ private IDistributedApplicationBuilder CreateBuilder()
 
     private sealed class TestProject : IServiceMetadata
     {
-        public string AssemblyName => "someapp.dll";
-
-        public string AssemblyPath => "non-exist-path";
-
         public string ProjectPath => "another-path";
     }
 }