Reacting to hosting changes

Author: halter73

src/Benchmarks/Middleware/DebugInfoPageMiddleware.cs

@@ -51,7 +51,7 @@ public async Task Invoke(HttpContext httpContext)
             await httpContext.Response.WriteAsync($"<li>Framework: {_appEnv.RuntimeFramework.FullName}</li>");
             await httpContext.Response.WriteAsync($"<li>Server GC enabled: {GCSettings.IsServerGC}</li>");
             await httpContext.Response.WriteAsync($"<li>Configuration: {_configurationName}</li>");
-            await httpContext.Response.WriteAsync($"<li>Server: {_hostingEnv.Configuration["server"]}</li>");
+            await httpContext.Response.WriteAsync($"<li>Server: {Program.Server}</li>");
             await httpContext.Response.WriteAsync($"<li>Server URLs: {string.Join(", ", _serverAddresses.Addresses)}</li>");
             await httpContext.Response.WriteAsync($"<li>Supports Send File: {httpContext.Features.Get<IHttpSendFileFeature>() != null}</li>");
 

src/Benchmarks/Program.cs

@@ -14,6 +14,7 @@ namespace Benchmarks
     public class Program
     {
         public static string[] Args;
+        public static string Server;
 
         public static void Main(string[] args)
         {
@@ -25,18 +26,21 @@ public static void Main(string[] args)
 
             Console.WriteLine($"Current directory: {Directory.GetCurrentDirectory()}");
 
-            var webHost = new WebHostBuilder()
+            var webHostBuilder = new WebHostBuilder()
                 .UseServer("Microsoft.AspNetCore.Server.Kestrel")
                 .UseCaptureStartupErrors(false)
-                .UseApplicationBasePath(Directory.GetCurrentDirectory())
+                .UseContentRoot(Directory.GetCurrentDirectory())
                 .UseDefaultConfiguration(args)
                 .UseStartup<Startup>()
                 .ConfigureServices(services => services
                     .AddSingleton(new ConsoleArgs(args))
                     .AddSingleton<IScenariosConfiguration, ConsoleHostScenariosConfiguration>()
                     .AddSingleton<Scenarios>()
-                )
-                .Build();
+                );
+
+            Server = webHostBuilder.GetSetting(WebHostDefaults.ServerKey);
+
+            var webHost = webHostBuilder.Build();
 
             StartInteractiveConsoleThread();
 

src/Benchmarks/Startup.cs

@@ -10,7 +10,6 @@
 using Benchmarks.Middleware;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.PlatformAbstractions;
@@ -24,7 +23,7 @@ public Startup(IApplicationEnvironment appEnv, IHostingEnvironment hostingEnv, S
             // Set up configuration sources.
             var builder = new ConfigurationBuilder()
                 .SetBasePath(appEnv.ApplicationBasePath)
-                .Include(hostingEnv.Configuration)
+                .AddCommandLine(Program.Args)
                 .AddJsonFile("appsettings.json")
                 .AddJsonFile($"appsettings.{hostingEnv.EnvironmentName}.json", optional: true)
                 .AddEnvironmentVariables();

src/Benchmarks/project.json

@@ -28,6 +28,7 @@
     },
     "net451": {}
   },
+  "content": [ "appsettings.json" ],
   "publishExclude": [
     "node_modules",
     "bower_components",