Merge branch 'release' into dev

samples/RoutingSample.Web/Startup.cs

@@ -38,7 +38,7 @@ namespace RoutingSample.Web
                 b.Use(next => async (c) =>
                 {
                     var culture = new CultureInfo((string)c.GetRouteValue("lang"));
-#if DNX451
+#if NET451
                     Thread.CurrentThread.CurrentCulture = culture;
                     Thread.CurrentThread.CurrentUICulture = culture;
 #else
@@ -66,7 +66,8 @@ namespace RoutingSample.Web
         {
             var host = new WebHostBuilder()
                 .UseDefaultHostingConfiguration(args)
-                .UseIISPlatformHandlerUrl()
+                .UseKestrel()
+                .UseIISIntegration()
                 .UseStartup<Startup>()
                 .Build();
 

samples/RoutingSample.Web/hosting.json

@@ -1,3 +0,0 @@
-{
-  "server": "Microsoft.AspNetCore.Server.Kestrel"
-}

samples/RoutingSample.Web/project.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Routing": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
@@ -8,16 +8,18 @@
   "compilationOptions": {
     "emitEntryPoint": true
   },
-  "commands": {
-    "web": "RoutingSample.Web"
-  },
   "frameworks": {
-    "dnx451": {},
+    "net451": {},
     "netstandardapp1.5": {
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-*"
+      },
       "imports": [
-        "dnxcore50",
-        "portable-net451+win8"
+        "dnxcore50"
       ]
     }
-  }
+  },
+  "content": [
+    "web.config"
+  ]
 }

samples/RoutingSample.Web/web.config

@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
+    </handlers>
+    <aspNetCore processPath=".\RoutingSample.Web.exe" arguments="" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>

samples/RoutingSample.Web/wwwroot/web.config

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <system.webServer>
-    <handlers>
-      <add name="httpPlatformHandler" path="*" verb="*" modules="httpPlatformHandler" resourceType="Unspecified" />
-    </handlers>
-    <httpPlatform processPath="%DNX_PATH%" arguments="%DNX_ARGS%" forwardWindowsAuthToken="false" startupTimeLimit="3600" />
-  </system.webServer>
-</configuration>