Honor PreferHostingUrls

src/Microsoft.AspNetCore.Server.Kestrel.Core/KestrelServer.cs

@@ -111,7 +111,7 @@ public void Start<TContext>(IHttpApplication<TContext> application)
                 var hasListenOptions = listenOptions.Any();
                 var hasServerAddresses = _serverAddresses.Addresses.Any();
 
-                if (hasListenOptions && hasServerAddresses)
+                if (hasListenOptions && hasServerAddresses && !_serverAddresses.PreferHostingUrls)
                 {
                     var joined = string.Join(", ", _serverAddresses.Addresses);
                     _logger.LogWarning($"Overriding address(es) '{joined}'. Binding to endpoints defined in UseKestrel() instead.");
@@ -131,8 +131,15 @@ public void Start<TContext>(IHttpApplication<TContext> application)
 
                     return;
                 }
-                else if (!hasListenOptions)
+                else if (!hasListenOptions || (_serverAddresses.PreferHostingUrls && hasServerAddresses))
                 {
+                    if (hasListenOptions)
+                    {
+                        var joined = string.Join(", ", _serverAddresses.Addresses);
+                        _logger.LogWarning($"Overriding endpoints defined in UseKestrel() since {nameof(IServerAddressesFeature.PreferHostingUrls)} is set to true. Binding to address(es) '{joined}' instead.");
+                        listenOptions.Clear();
+                    }
+
                     // If no endpoints are configured directly using KestrelServerOptions, use those configured via the IServerAddressesFeature.
                     var copiedAddresses = _serverAddresses.Addresses.ToArray();
                     _serverAddresses.Addresses.Clear();

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/AddressRegistrationTests.cs

@@ -153,10 +153,7 @@ private async Task RegisterDefaultServerAddresses_Success(IEnumerable<string> ad
 
             var hostBuilder = new WebHostBuilder()
                .UseKestrel()
-               .ConfigureServices(services =>
-               {
-                   services.AddSingleton<ILoggerFactory>(new KestrelTestLoggerFactory(testLogger));
-               })
+               .UseLoggerFactory(_ => new KestrelTestLoggerFactory(testLogger))
                .Configure(ConfigureEchoAddress);
 
             using (var host = hostBuilder.Build())
@@ -218,6 +215,71 @@ public void ThrowsWhenBindingToIPv6AddressInUse()
             }
         }
 
+        [ConditionalFact]
+        [PortSupportedCondition(5002)]
+        public async Task OverrideDirectConfigurationWithIServerAddressesFeature_Succeeds()
+        {
+            var overrideAddress = "http://localhost:5002";
+            var testLogger = new TestApplicationErrorLogger();
+            var hostBuilder = new WebHostBuilder()
+               .UseKestrel(options => options.Listen(IPAddress.Loopback, 5001))
+               .UseUrls(overrideAddress)
+               .PreferHostingUrls(true)
+               .UseLoggerFactory(_ => new KestrelTestLoggerFactory(testLogger))
+               .Configure(ConfigureEchoAddress);
+
+            using (var host = hostBuilder.Build())
+            {
+                host.Start();
+
+                Assert.Equal(5002, host.GetPort());
+                Assert.Single(testLogger.Messages, log => log.LogLevel == LogLevel.Warning &&
+                    string.Equals($"Overriding endpoints defined in UseKestrel() since {nameof(IServerAddressesFeature.PreferHostingUrls)} is set to true. Binding to address(es) '{overrideAddress}' instead.",
+                    log.Message, StringComparison.Ordinal));
+
+                Assert.Equal(new Uri(overrideAddress).ToString(), await HttpClientSlim.GetStringAsync(overrideAddress));
+            }
+        }
+
+        [ConditionalFact]
+        [PortSupportedCondition(5001)]
+        public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfPreferHostingUrlsFalse()
+        {
+            var endPointAddress = "http://localhost:5001";
+            var hostBuilder = new WebHostBuilder()
+               .UseKestrel(options => options.Listen(IPAddress.Loopback, 5001))
+               .UseUrls("http://localhost:5002")
+               .PreferHostingUrls(false)
+               .Configure(ConfigureEchoAddress);
+
+            using (var host = hostBuilder.Build())
+            {
+                host.Start();
+
+                Assert.Equal(5001, host.GetPort());
+                Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress));
+            }
+        }
+
+        [ConditionalFact]
+        [PortSupportedCondition(5000)]
+        public async Task DoesNotOverrideDirectConfigurationWithIServerAddressesFeature_IfAddressesEmpty()
+        {
+            var endPointAddress = "http://localhost:5001";
+            var hostBuilder = new WebHostBuilder()
+               .UseKestrel(options => options.Listen(IPAddress.Loopback, 5001))
+               .PreferHostingUrls(true)
+               .Configure(ConfigureEchoAddress);
+
+            using (var host = hostBuilder.Build())
+            {
+                host.Start();
+
+                Assert.Equal(5001, host.GetPort());
+                Assert.Equal(new Uri(endPointAddress).ToString(), await HttpClientSlim.GetStringAsync(endPointAddress));
+            }
+        }
+
         [Fact]
         public void ThrowsWhenBindingLocalhostToIPv4AddressInUse()
         {