huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' into dev

This commit is contained in:
Mike Harder 2016-04-18 16:59:08 -07:00
parent 0d9dc1a205 0453e4af70
commit 8b83f1ee6b
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Server.Kestrel/WebHostBuilderKestrelExtensions.cs
View File

@ -44,12 +44,10 @@ namespace Microsoft.AspNetCore.Hosting
/// </returns>
public static IWebHostBuilder UseKestrel(this IWebHostBuilder hostBuilder, Action<KestrelServerOptions> options)
{
hostBuilder.ConfigureServices(services =>
return hostBuilder.UseKestrel().ConfigureServices(services =>
{
services.Configure(options);
});
return hostBuilder.UseKestrel();
}
}
}

18
test/Microsoft.AspNetCore.Server.KestrelTests/WebHostBuilderKestrelExtensionsTests.cs
View File

@ -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();
}
}
}