diff --git a/src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs b/src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs index 44c733b776..8d26d2deaa 100644 --- a/src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs +++ b/src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs @@ -44,12 +44,10 @@ namespace Microsoft.AspNetCore.Hosting /// public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder, Action options) { - hostBuilder.ConfigureServices(services => + return hostBuilder.UseKestrel().ConfigureServices(services => { services.Configure(options); }); - - return hostBuilder.UseKestrel(); } } } diff --git a/test/Microsoft.AspNetCore.Server.KestrelTests/WebHostBuilderKestrelExtensionsTests.cs b/test/Microsoft.AspNetCore.Server.KestrelTests/WebHostBuilderKestrelExtensionsTests.cs index 7253c4a465..12e1d9e350 100644 --- a/test/Microsoft.AspNetCore.Server.KestrelTests/WebHostBuilderKestrelExtensionsTests.cs +++ b/test/Microsoft.AspNetCore.Server.KestrelTests/WebHostBuilderKestrelExtensionsTests.cs @@ -29,7 +29,23 @@ namespace Microsoft.AspNetCore.Server.KestrelTests }); // Act - var host = hostBuilder.Build(); + hostBuilder.Build(); + } + + [Fact] + public void ApplicationServicesNotNullDuringUseKestrelWithOptions() + { + // Arrange + var hostBuilder = new WebHostBuilder() + .UseKestrel(options => + { + // Assert + Assert.NotNull(options.ApplicationServices); + }) + .Configure(app => { }); + + // Act + hostBuilder.Build(); } } }