Reference Foundry project from hosted agent target

Author: tommasodotNET

src/Aspire.Hosting.Foundry/HostedAgent/HostedAgentBuilderExtension.cs

@@ -144,6 +144,20 @@ private static void AddProjectReferenceForRunMode<T>(
         }
     }
 
+    private static void AddProjectReferenceForPublishMode(
+        IDistributedApplicationBuilder applicationBuilder,
+        IResource target,
+        IResourceBuilder<AzureCognitiveServicesProjectResource> project)
+    {
+        if (target is not IResourceWithEnvironment targetWithEnvironment)
+        {
+            throw new InvalidOperationException($"Unable to reference Foundry project from resource '{target.Name}' because it does not support environment variables.");
+        }
+
+        applicationBuilder.CreateResourceBuilder(targetWithEnvironment)
+            .WithReference(project);
+    }
+
     private static IResourceBuilder<AzureCognitiveServicesProjectResource> ResolveProjectBuilderForPublish<T>(IResourceBuilder<T> builder)
         where T : IResourceWithEndpoints, IResourceWithEnvironment, IComputeResource
     {
@@ -308,7 +322,8 @@ private static void ConfigurePublishMode<T>(
         {
             // Ensure we have a container resource to deploy.
             // ExecutableResource needs PublishAsDockerFile() to convert it into a container resource at this stage.
-            builder.ApplicationBuilder.CreateResourceBuilder(executableResource).PublishAsDockerFile();
+            builder.ApplicationBuilder.CreateResourceBuilder(executableResource)
+                .PublishAsDockerFile();
 
             if (builder.ApplicationBuilder.TryCreateResourceBuilder(resource.Name, out containerResourceBuilder))
             {
@@ -328,6 +343,8 @@ private static void ConfigurePublishMode<T>(
             throw new InvalidOperationException($"Unable to create hosted agent for resource '{resource.Name}' because it is not a container, executable, or project resource.");
         }
 
+        AddProjectReferenceForPublishMode(builder.ApplicationBuilder, target, project);
+
         // Create a separate agent resource to host the deployment.
         var hostedAgent = new AzureHostedAgentResource(agentName, target, configure);
 
@@ -340,7 +357,6 @@ private static void ConfigurePublishMode<T>(
 
         builder.ApplicationBuilder.AddResource(hostedAgent)
             .WithIconName("Agents")
-            .WithReferenceRelationship(target)
-            .WithReference(project);
+            .WithReferenceRelationship(target);
     }
 }

tests/Aspire.Hosting.Foundry.Tests/HostedAgentExtensionTests.cs

@@ -142,6 +142,29 @@ public void AsHostedAgent_InPublishMode_CreatesHostedAgentResource()
         Assert.Equal("agent-ha", hostedAgent.Name);
     }
 
+    [Fact]
+    public void AsHostedAgent_InPublishMode_AddsProjectReferenceToDeploymentTarget()
+    {
+        using var builder = TestDistributedApplicationBuilder.Create(DistributedApplicationOperation.Publish);
+        var project = builder.AddFoundry("account")
+            .AddProject("my-project");
+
+        builder.AddProject<Project>("agent", launchProfileName: null)
+            .AsHostedAgent(project);
+
+        builder.Build();
+
+        var hostedAgent = Assert.Single(builder.Resources.OfType<AzureHostedAgentResource>());
+
+        Assert.True(hostedAgent.Target.TryGetAnnotationsOfType<ResourceRelationshipAnnotation>(out var relationships));
+        Assert.Contains(relationships, r =>
+            r.Type == "Reference" &&
+            ReferenceEquals(r.Resource, project.Resource));
+        Assert.DoesNotContain(hostedAgent.Annotations.OfType<ResourceRelationshipAnnotation>(), r =>
+            r.Type == "Reference" &&
+            ReferenceEquals(r.Resource, project.Resource));
+    }
+
     [Fact]
     public void AsHostedAgent_WithOptions_AppliesAllPropertiesToConfiguration()
     {
@@ -282,4 +305,9 @@ public async Task FoundryProject_DefaultRegistryDoesNotAddGlobalRegistryTargets(
 
     [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ExecuteBeforeStartHooksAsync")]
     private static extern Task ExecuteBeforeStartHooksAsync(DistributedApplication app, CancellationToken cancellationToken);
+
+    private sealed class Project : IProjectMetadata
+    {
+        public string ProjectPath => "project";
+    }
 }