Merge branch 'hishamco-dev' into dev

2016-02-03 16:17:05 -08:00 · 2016-02-03 16:17:05 -08:00 · 44905b6b8b
parent 461fd40251 c9d8a1330e
commit 44905b6b8b
2 changed files with 1 additions and 3 deletions
--- a/samples/SessionSample/Startup.cs
+++ b/samples/SessionSample/Startup.cs
@ -80,6 +80,7 @@ namespace SessionSample
        {
            var host = new WebHostBuilder()
                .UseDefaultConfiguration(args)
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                .UseIISPlatformHandlerUrl()
                .UseStartup<Startup>()
                .Build();
--- a/samples/SessionSample/hosting.json
+++ b/samples/SessionSample/hosting.json
@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}