Fix build breaks and nullability in public APIs

Author: karolz-ms

src/Aspire.Hosting/ApplicationModel/ResourceExtensions.cs

@@ -673,7 +673,15 @@ public static bool TryGetUrls(this IResource resource, [NotNullWhen(true)] out I
     /// </summary>
     /// <param name="resource">The <see cref="IResourceWithEndpoints"/> which contains <see cref="EndpointAnnotation"/> annotations.</param>
     /// <returns>An enumeration of <see cref="EndpointReference"/> based on the <see cref="EndpointAnnotation"/> annotations from the resources' <see cref="IResource.Annotations"/> collection.</returns>
-    public static IEnumerable<EndpointReference> GetEndpoints(this IResourceWithEndpoints resource) => resource.GetEndpoints(null);
+    public static IEnumerable<EndpointReference> GetEndpoints(this IResourceWithEndpoints resource)
+    {
+        if (TryGetAnnotationsOfType<EndpointAnnotation>(resource, out var endpoints))
+        {
+            return endpoints.Select(e => new EndpointReference(resource, e));
+        }
+
+        return [];
+    }
 
 
     /// <summary>
@@ -698,7 +706,7 @@ public static IEnumerable<EndpointReference> GetEndpoints(this IResourceWithEndp
     /// <param name="resource">The <see cref="IResourceWithEndpoints"/> which contains <see cref="EndpointAnnotation"/> annotations.</param>
     /// <param name="endpointName">The name of the endpoint.</param>
     /// <returns>An <see cref="EndpointReference"/>object providing resolvable reference for the specified endpoint.</returns>
-    public static EndpointReference GetEndpoint(this IResourceWithEndpoints resource, string endpointName) => resource.GetEndpoint(endpointName, null);
+    public static EndpointReference GetEndpoint(this IResourceWithEndpoints resource, string endpointName) => resource.GetEndpoint(endpointName);
 
     /// <summary>
     /// Gets an endpoint reference for the specified endpoint name.
@@ -719,7 +727,6 @@ public static EndpointReference GetEndpoint(this IResourceWithEndpoints resource
         }
         else
         {
-            contextNetworkID ??= endpoint.DefaultNetworkID;
             return new EndpointReference(resource, endpoint, contextNetworkID);
         }
 

src/Aspire.Hosting/ResourceBuilderExtensions.cs

@@ -807,7 +807,7 @@ public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> build
     }
 
     /// <summary>
-    /// Exposes an endpoint on a resource. A reference to this endpoint can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier?)"/>.
+    /// Exposes an endpoint on a resource. A reference to this endpoint can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier)"/>.
     /// The endpoint name will be the scheme name if not specified.
     /// </summary>
     /// <typeparam name="T">The resource type.</typeparam>
@@ -863,7 +863,7 @@ public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> build
     }
 
     /// <summary>
-    /// Exposes an endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier?)"/>.
+    /// Exposes an endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier)"/>.
     /// The endpoint name will be the scheme name if not specified.
     /// </summary>
     /// <typeparam name="T">The resource type.</typeparam>
@@ -883,7 +883,7 @@ public static IResourceBuilder<T> WithEndpoint<T>(this IResourceBuilder<T> build
     }
 
     /// <summary>
-    /// Exposes an HTTP endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier?)"/>.
+    /// Exposes an HTTP endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier)"/>.
     /// The endpoint name will be "http" if not specified.
     /// </summary>
     /// <typeparam name="T">The resource type.</typeparam>
@@ -903,7 +903,7 @@ public static IResourceBuilder<T> WithHttpEndpoint<T>(this IResourceBuilder<T> b
     }
 
     /// <summary>
-    /// Exposes an HTTPS endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier?)"/>.
+    /// Exposes an HTTPS endpoint on a resource. This endpoint reference can be retrieved using <see cref="ResourceBuilderExtensions.GetEndpoint{T}(IResourceBuilder{T}, string, NetworkIdentifier)"/>.
     /// The endpoint name will be "https" if not specified.
     /// </summary>
     /// <typeparam name="T">The resource type.</typeparam>
@@ -957,7 +957,7 @@ public static IResourceBuilder<T> WithExternalHttpEndpoints<T>(this IResourceBui
     /// <param name="name">The name of the endpoint.</param>
     /// <param name="contextNetworkID">The network context in which to resolve the endpoint. If null, localhost (loopback) network context will be used.</param>
     /// <returns>An <see cref="EndpointReference"/> that can be used to resolve the address of the endpoint after resource allocation has occurred.</returns>
-    public static EndpointReference GetEndpoint<T>(this IResourceBuilder<T> builder, [EndpointName] string name, NetworkIdentifier? contextNetworkID = null) where T : IResourceWithEndpoints
+    public static EndpointReference GetEndpoint<T>(this IResourceBuilder<T> builder, [EndpointName] string name, NetworkIdentifier contextNetworkID) where T : IResourceWithEndpoints
     {
         ArgumentNullException.ThrowIfNull(builder);
 
@@ -976,7 +976,7 @@ public static EndpointReference GetEndpoint<T>(this IResourceBuilder<T> builder,
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-        return builder.Resource.GetEndpoint(name, null);
+        return builder.Resource.GetEndpoint(name);
     }
 
     /// <summary>

tests/Aspire.Hosting.Tests/ExecutableResourceTests.cs

@@ -36,7 +36,7 @@ public async Task AddExecutableWithArgs()
                  context.Args.Add("arg2");
                  context.Args.Add(exe1.GetEndpoint("ep"));
                  context.Args.Add(testResource2);
-                 context.Args.Add(((IResourceWithEndpoints)context.Resource).GetEndpoint("ep", null));
+                 context.Args.Add(((IResourceWithEndpoints)context.Resource).GetEndpoint("ep"));
              });
 
         using var app = appBuilder.Build();

tests/Aspire.Hosting.Tests/ProjectResourceTests.cs

@@ -599,7 +599,7 @@ public async Task AddProjectWithArgs()
              {
                  context.Args.Add("arg1");
                  context.Args.Add(c1.GetEndpoint("ep"));
-                 context.Args.Add(((IResourceWithEndpoints)context.Resource).GetEndpoint("ep", null));
+                 context.Args.Add(((IResourceWithEndpoints)context.Resource).GetEndpoint("ep"));
              });
 
         using var app = appBuilder.Build();
@@ -645,8 +645,8 @@ public async Task AddProjectWithWildcardUrlInLaunchSettings(bool isProxied)
 
         var config = await EnvironmentVariableEvaluator.GetEnvironmentVariablesAsync(resource, DistributedApplicationOperation.Run, TestServiceProvider.Instance).DefaultTimeout();
 
-        var http = resource.GetEndpoint("http", null);
-        var https = resource.GetEndpoint("https", null);
+        var http = resource.GetEndpoint("http");
+        var https = resource.GetEndpoint("https");
 
         if (isProxied)
         {