From 2b2c42069c3eb16ef820cae805467bd64d04e290 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Thu, 17 Dec 2015 21:35:28 -0800
Subject: [PATCH] Reacting to hew Hosting API

---
 samples/StaticFileSample/Startup.cs           | 11 +++++++
 samples/StaticFileSample/hosting.json         |  3 ++
 samples/StaticFileSample/project.json         | 30 +++++++++----------
 samples/StaticFileSample/wwwroot/web.config   |  9 ++++++
 .../StaticFileMiddlewareTests.cs              |  6 ++--
 .../StaticFilesTestServer.cs                  |  7 ++++-
 6 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 samples/StaticFileSample/hosting.json
 create mode 100644 samples/StaticFileSample/wwwroot/web.config

diff --git a/samples/StaticFileSample/Startup.cs b/samples/StaticFileSample/Startup.cs
index 908492b924..f481a4deab 100644
--- a/samples/StaticFileSample/Startup.cs
+++ b/samples/StaticFileSample/Startup.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.StaticFiles;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -22,5 +23,15 @@ namespace StaticFilesSample
                 EnableDirectoryBrowsing = true,
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var application = new WebApplicationBuilder()
+                .UseConfiguration(WebApplicationConfiguration.GetDefault(args))
+                .UseStartup<Startup>()
+                .Build();
+
+            application.Run();
+        }
     }
 }
\ No newline at end of file
diff --git a/samples/StaticFileSample/hosting.json b/samples/StaticFileSample/hosting.json
new file mode 100644
index 0000000000..f8ef14574d
--- /dev/null
+++ b/samples/StaticFileSample/hosting.json
@@ -0,0 +1,3 @@
+{
+  "server": "Microsoft.AspNet.Server.Kestrel"
+}
diff --git a/samples/StaticFileSample/project.json b/samples/StaticFileSample/project.json
index 22e540bbe5..205386ff3c 100644
--- a/samples/StaticFileSample/project.json
+++ b/samples/StaticFileSample/project.json
@@ -1,17 +1,17 @@
 {
-    "commands": {
-        "web": "Microsoft.AspNet.Hosting --server Microsoft.AspNet.Server.WebListener --server.Urls http://localhost:12345/"
-    },
-    "dependencies": {
-        "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
-        "Microsoft.AspNet.Server.IIS": "1.0.0-*",
-        "Microsoft.AspNet.Server.WebListener": "1.0.0-*",
-        "Microsoft.AspNet.StaticFiles": "1.0.0-*",
-        "Microsoft.Extensions.Logging.Console": "1.0.0-*"
-    },
-    "frameworks": {
-        "dnx451": {},
-        "dnxcore50": {}
-    },
-    "webroot": "wwwroot"
+  "compilationOptions": {
+    "emitEntryPoint": true
+  },
+  "commands": {
+    "web": "StaticFileSample"
+  },
+  "dependencies": {
+    "Microsoft.AspNet.Server.Kestrel": "1.0.0-*",
+    "Microsoft.AspNet.StaticFiles": "1.0.0-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*"
+  },
+  "frameworks": {
+    "dnx451": { },
+    "dnxcore50": { }
+  },
 }
diff --git a/samples/StaticFileSample/wwwroot/web.config b/samples/StaticFileSample/wwwroot/web.config
new file mode 100644
index 0000000000..9a0d90abf8
--- /dev/null
+++ b/samples/StaticFileSample/wwwroot/web.config
@@ -0,0 +1,9 @@
+<?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>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
index 900badb388..e5cd183da9 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFileMiddlewareTests.cs
@@ -4,10 +4,10 @@
 using System;
 using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.TestHost;
 using Microsoft.AspNet.Testing.xunit;
@@ -20,7 +20,9 @@ namespace Microsoft.AspNet.StaticFiles
         [Fact]
         public async Task ReturnsNotFoundWithoutWwwroot()
         {
-            var server = TestServer.Create(app => app.UseStaticFiles());
+            var builder = new WebApplicationBuilder()
+                .Configure(app => app.UseStaticFiles());
+            var server = new TestServer(builder);
 
             var response = await server.CreateClient().GetAsync("/ranges.txt");
 
diff --git a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
index 959a555e68..cb35f5be4c 100644
--- a/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
+++ b/test/Microsoft.AspNet.StaticFiles.Tests/StaticFilesTestServer.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Microsoft.AspNet.Builder;
+using Microsoft.AspNet.Hosting;
 using Microsoft.AspNet.TestHost;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -19,7 +20,11 @@ namespace Microsoft.AspNet.StaticFiles
             {
                 new KeyValuePair<string, string>("webroot", ".")
             });
-            return TestServer.Create(configurationBuilder.Build(), configureApp, configureServices: configureServices);
+            var builder = new WebApplicationBuilder()
+                .UseConfiguration(configurationBuilder.Build())
+                .Configure(configureApp)
+                .ConfigureServices(configureServices);
+            return new TestServer(builder);
         }
     }
 }
\ No newline at end of file