Merge branch 'release' into dev

This commit is contained in:
Pranav K 2016-04-26 09:14:58 -07:00
commit fcb476500c
2 changed files with 2 additions and 3 deletions

View File

@ -17,7 +17,7 @@
} }
}, },
"imports": [ "imports": [
"dnxcore50" "portable-dnxcore50+net45+win8+wp8+wpa81"
] ]
} }
}, },

View File

@ -7,13 +7,12 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.PlatformAbstractions;
namespace SampleApp namespace SampleApp
{ {
public class Startup public class Startup
{ {
public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IApplicationEnvironment env) public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory)
{ {
loggerFactory.AddConsole(LogLevel.Trace); loggerFactory.AddConsole(LogLevel.Trace);