merge

Author: BrennanConroy

playground/ProxylessEndToEnd/ProxylessEndToEnd.AppHost/Program.cs

@@ -9,12 +9,7 @@
 });
 
 builder.AddProject<Projects.ProxylessEndToEnd_ApiService>("api")
-    .WithEndpoint("http", ea =>
-    {
-        ea.UriScheme = "http";
-        ea.Port = 12345;
-        ea.IsProxied = false;
-    })
+    .WithEndpoint(12345, "http", isProxied: false)
     .WithReference(redis);
 
 builder.AddProject<Projects.ProxylessEndToEnd_ApiService>("api2")

playground/SqlServerEndToEnd/SqlServerEndToEnd.AppHost/Program.cs

@@ -6,9 +6,11 @@
 var db1 = builder.AddSqlServer("sql1").PublishAsAzureSqlDatabase().AddDatabase("db1");
 var db2 = builder.AddSqlServer("sql2").PublishAsContainer().AddDatabase("db2");
 
-builder.AddProject<Projects.SqlServerEndToEnd_ApiService>("api")
-       .WithReference(db1)
-       .WithReference(db2);
+//var db1 = builder.AddSqlServer("sql1").AddDatabase("db1");
+//var db2 = builder.AddSqlServer("sql2").PublishAsContainer().AddDatabase("db2");
+
+builder.AddProject<Projects.SqlServerEndToEnd_ApiService>("api");
+       //.WithReference(ai);
 
 // This project is only added in playground projects to support development/debugging
 // of the dashboard. It is not required in end developer code. Comment out this code

src/Aspire.Hosting/ApplicationModel/EndpointAnnotation.cs

@@ -26,6 +26,7 @@ public sealed class EndpointAnnotation : IResourceAnnotation
     /// <param name="containerPort">If the endpoint is used for the container, this is the port the container process is listening on.</param>
     /// <param name="isExternal">Indicates that this endpoint should be exposed externally at publish time.</param>
     /// <param name="env">The name of the environment variable that will be set to the port number of this endpoint.</param>
+    /// <param name="isProxied">Specifies if the endpoint will be proxied by DCP. Defaults to true.</param>
     public EndpointAnnotation(ProtocolType protocol, string? uriScheme = null, string? transport = null, string? name = null, int? port = null, int? containerPort = null, bool? isExternal = null, string? env = null, bool isProxied = true)
     {
         // If the URI scheme is null, we'll adopt either udp:// or tcp:// based on the

src/Aspire.Hosting/Dcp/ApplicationExecutor.cs

@@ -758,6 +758,7 @@ private async Task CreateContainersAsync(IEnumerable<AppResource> containerResou
 
                         if (!sp.EndpointAnnotation.IsProxied)
                         {
+                            // When DCP isn't proxying the container we need to set the host port that the containers internal port will be mapped to
                             portSpec.HostPort = sp.EndpointAnnotation.Port;
                         }
 

src/Aspire.Hosting/Dcp/DcpDistributedApplicationLifecycleHook.cs

@@ -45,6 +45,7 @@ private static void PrepareServices(DistributedApplicationModel model)
 
                 if (endpointAnnotations.Any())
                 {
+                    // We have a non-proxied endpoint with the same name as the 'url', don't add another endpoint for the same name
                     continue;
                 }
 

src/Aspire.Hosting/Extensions/ResourceBuilderExtensions.cs

@@ -323,9 +323,9 @@ private static void ApplyEndpoints<T>(this IResourceBuilder<T> builder, IResourc
     /// <param name="env"></param>
     /// <returns></returns>
     [Obsolete("WithServiceBinding has been renamed to WithEndpoint. Use WithEndpoint instead.")]
-    public static IResourceBuilder<T> WithServiceBinding<T>(this IResourceBuilder<T> builder, int? hostPort = null, string? scheme = null, string? name = null, string? env = null, bool isProxied = true) where T : IResource
+    public static IResourceBuilder<T> WithServiceBinding<T>(this IResourceBuilder<T> builder, int? hostPort = null, string? scheme = null, string? name = null, string? env = null) where T : IResource
     {
-        return builder.WithEndpoint(hostPort: hostPort, scheme: scheme, name: name, env: env, isProxied: isProxied);
+        return builder.WithEndpoint(hostPort: hostPort, scheme: scheme, name: name, env: env);
     }
 
     /// <summary>
@@ -430,9 +430,9 @@ public static IResourceBuilder<T> WithHttpsEndpoint<T>(this IResourceBuilder<T>
     /// <param name="env"></param>
     /// <returns></returns>
     [Obsolete("WithServiceBinding has been renamed to WithEndpoint. Use WithEndpoint instead.")]
-    public static IResourceBuilder<T> WithServiceBinding<T>(this IResourceBuilder<T> builder, int containerPort, int? hostPort = null, string? scheme = null, string? name = null, string? env = null, bool isProxied = true) where T : IResource
+    public static IResourceBuilder<T> WithServiceBinding<T>(this IResourceBuilder<T> builder, int containerPort, int? hostPort = null, string? scheme = null, string? name = null, string? env = null) where T : IResource
     {
-        return builder.WithEndpoint(containerPort: containerPort, hostPort: hostPort, scheme: scheme, name: name, env: env, isProxied: isProxied);
+        return builder.WithEndpoint(containerPort: containerPort, hostPort: hostPort, scheme: scheme, name: name, env: env);
     }
 
     /// <summary>

tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs

@@ -13,7 +13,6 @@
 using Xunit;
 using Xunit.Abstractions;
 using Xunit.Sdk;
-using VolumeMountType = Aspire.Hosting.ApplicationModel.VolumeMountType;
 
 namespace Aspire.Hosting.Tests;