Add WithParentRelationship overload accepting an IResourceBuilder

playground/Redis/Redis.AppHost/Program.cs

@@ -2,8 +2,8 @@
 
 var redis = builder.AddRedis("redis");
 redis.WithDataVolume()
-    .WithRedisCommander(c => c.WithHostPort(33803).WithParentRelationship(redis.Resource))
-    .WithRedisInsight(c => c.WithHostPort(41567).WithParentRelationship(redis.Resource));
+    .WithRedisCommander(c => c.WithHostPort(33803).WithParentRelationship(redis))
+    .WithRedisInsight(c => c.WithHostPort(41567).WithParentRelationship(redis));
 
 var garnet = builder.AddGarnet("garnet")
     .WithDataVolume();

src/Aspire.Hosting.Azure.EventHubs/AzureEventHubsExtensions.cs

@@ -213,7 +213,7 @@ public static IResourceBuilder<AzureEventHubsResource> RunAsEmulator(this IResou
         // Create a separate storage emulator for the Event Hub one
         var storageResource = builder.ApplicationBuilder
                 .AddAzureStorage($"{builder.Resource.Name}-storage")
-                .WithParentRelationship(builder.Resource);
+                .WithParentRelationship(builder);
 
         var lifetime = ContainerLifetime.Session;
 

src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs

@@ -347,7 +347,7 @@ public static IResourceBuilder<AzureServiceBusResource> RunAsEmulator(this IReso
                 {
                     context.EnvironmentVariables["MSSQL_SA_PASSWORD"] = passwordParameter;
                 })
-                .WithParentRelationship(builder.Resource);
+                .WithParentRelationship(builder);
 
         builder.WithAnnotation(new EnvironmentCallbackAnnotation((EnvironmentCallbackContext context) =>
         {

src/Aspire.Hosting.MongoDB/MongoDBBuilderExtensions.cs

@@ -156,7 +156,7 @@ public static IResourceBuilder<T> WithMongoExpress<T>(this IResourceBuilder<T> b
                                                         .WithImageRegistry(MongoDBContainerImageTags.MongoExpressRegistry)
                                                         .WithEnvironment(context => ConfigureMongoExpressContainer(context, builder.Resource))
                                                         .WithHttpEndpoint(targetPort: 8081, name: "http")
-                                                        .WithParentRelationship(builder.Resource)
+                                                        .WithParentRelationship(builder)
                                                         .ExcludeFromManifest();
 
         configureContainer?.Invoke(resourceBuilder);

src/Aspire.Hosting/ResourceBuilderExtensions.cs

@@ -1138,6 +1138,36 @@ public static IResourceBuilder<T> WithRelationship<T>(
         return builder.WithAnnotation(new ResourceRelationshipAnnotation(resource, type));
     }
 
+    /// <summary>
+    /// Adds a <see cref="ResourceRelationshipAnnotation"/> to the resource annotations to add a parent-child relationship.
+    /// </summary>
+    /// <typeparam name="T">The type of the resource.</typeparam>
+    /// <param name="builder">The resource builder.</param>
+    /// <param name="parent">The parent of <paramref name="builder"/>.</param>
+    /// <returns>A resource builder.</returns>
+    /// <remarks>
+    /// <para>
+    /// The <c>WithParentRelationship</c> method is used to add parent relationships to the resource. Relationships are used to link
+    /// resources together in UI.
+    /// </para>
+    /// </remarks>
+    /// <example>
+    /// This example shows adding a relationship between two resources.
+    /// <code lang="C#">
+    /// var builder = DistributedApplication.CreateBuilder(args);
+    /// var backend = builder.AddProject&lt;Projects.Backend&gt;("backend");
+    /// 
+    /// var frontend = builder.AddProject&lt;Projects.Manager&gt;("frontend")
+    ///                      .WithParentRelationship(backend);
+    /// </code>
+    /// </example>
+    public static IResourceBuilder<T> WithParentRelationship<T>(
+        this IResourceBuilder<T> builder,
+        IResourceBuilder<IResource> parent) where T : IResource
+    {
+        return builder.WithParentRelationship(parent.Resource);
+    }
+
     /// <summary>
     /// Adds a <see cref="ResourceRelationshipAnnotation"/> to the resource annotations to add a parent-child relationship.
     /// </summary>

tests/Aspire.Hosting.Tests/Orchestrator/ApplicationOrchestratorTests.cs

@@ -68,10 +68,10 @@ public async Task WithParentRelationshipSetsParentPropertyCorrectly()
         var builder = DistributedApplication.CreateBuilder();
 
         var parent = builder.AddContainer("parent", "image");
-        var child = builder.AddContainer("child", "image").WithParentRelationship(parent.Resource);
-        var child2 = builder.AddContainer("child2", "image").WithParentRelationship(parent.Resource);
+        var child = builder.AddContainer("child", "image").WithParentRelationship(parent);
+        var child2 = builder.AddContainer("child2", "image").WithParentRelationship(parent);
 
-        var nestedChild = builder.AddContainer("nested-child", "image").WithParentRelationship(child.Resource);
+        var nestedChild = builder.AddContainer("nested-child", "image").WithParentRelationship(child);
 
         using var app = builder.Build();
         var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>();
@@ -137,8 +137,8 @@ public async Task LastWithParentRelationshipWins()
 
         var child = builder.AddContainer("child", "image");
 
-        child.WithParentRelationship(firstParent.Resource);
-        child.WithParentRelationship(secondParent.Resource);
+        child.WithParentRelationship(firstParent);
+        child.WithParentRelationship(secondParent);
 
         using var app = builder.Build();
         var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>();
@@ -191,7 +191,7 @@ public async Task WithParentRelationshipWorksWithProjects()
         var builder = DistributedApplication.CreateBuilder();
 
         var projectA = builder.AddProject<ProjectA>("projecta");
-        var projectB = builder.AddProject<ProjectB>("projectb").WithParentRelationship(projectA.Resource);
+        var projectB = builder.AddProject<ProjectB>("projectb").WithParentRelationship(projectA);
 
         using var app = builder.Build();
         var distributedAppModel = app.Services.GetRequiredService<DistributedApplicationModel>();
@@ -241,9 +241,9 @@ public void DetectsCircularDependency()
         var container2 = builder.AddContainer("container2", "image2");
         var container3 = builder.AddContainer("container3", "image3");
 
-        container1.WithParentRelationship(container2.Resource);
-        container2.WithParentRelationship(container3.Resource);
-        container3.WithParentRelationship(container1.Resource);
+        container1.WithParentRelationship(container2);
+        container2.WithParentRelationship(container3);
+        container3.WithParentRelationship(container1);
 
         using var app = builder.Build();
 

tests/Aspire.Hosting.Tests/Orchestrator/RelationshipEvaluatorTests.cs

@@ -20,10 +20,10 @@ public void HandlesNestedChildren()
         var greatGrandChildResource = builder.AddResource(new CustomChildResource("greatgrandchild", grandChildResource.Resource));
 
         var childWithAnnotationsResource = builder.AddContainer("child-with-annotations", "image")
-            .WithParentRelationship(parentResource.Resource);
+            .WithParentRelationship(parentResource);
 
         var grandChildWithAnnotationsResource = builder.AddContainer("grandchild-with-annotations", "image")
-            .WithParentRelationship(childWithAnnotationsResource.Resource);
+            .WithParentRelationship(childWithAnnotationsResource);
 
         using var app = builder.Build();
         var appModel = app.Services.GetRequiredService<DistributedApplicationModel>();