Merge branch 'release' into dev

2016-04-14 13:23:15 -07:00 · 2016-04-14 13:23:15 -07:00 · 5ca5d07404
parent eb116cdb56 6dc0005a43
commit 5ca5d07404
1 changed files with 3 additions and 1 deletions
--- a/test/ServerComparison.TestSites/Program.cs
+++ b/test/ServerComparison.TestSites/Program.cs
@ -10,7 +10,9 @@ namespace ServerComparison.TestSites
        public static void Main(string[] args)
        {
            var host = new WebHostBuilder()
-                .UseKestrel()
+                // We set the server by name before default args so that command line arguments can override it.
+                // This is used to allow deployers to choose the server for testing.
+                .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                .UseDefaultHostingConfiguration(args)
                .UseIISIntegration()
                .UseStartup("ServerComparison.TestSites")