Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
BrennanConroy 2017-05-03 14:24:37 -07:00
commit aa0ed113db
1 changed files with 7 additions and 4 deletions

View File

@ -24,13 +24,10 @@ namespace MvcSandbox
} }
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline. // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) public void Configure(IApplicationBuilder app)
{ {
app.UseDeveloperExceptionPage(); app.UseDeveloperExceptionPage();
app.UseStaticFiles(); app.UseStaticFiles();
loggerFactory
.AddConsole()
.AddDebug();
app.UseMvc(routes => app.UseMvc(routes =>
{ {
routes.MapRoute( routes.MapRoute(
@ -43,6 +40,12 @@ namespace MvcSandbox
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
.ConfigureLogging(factory =>
{
factory
.AddConsole()
.AddDebug();
})
.UseIISIntegration() .UseIISIntegration()
.UseKestrel() .UseKestrel()
.UseStartup<Startup>() .UseStartup<Startup>()