WIP: Simplify hosting configuration with some extension methods

samples/SampleStartups/StartupBlockingOnStart.cs

@@ -40,7 +40,8 @@ public static void Main(string[] args)
             using (host)
             {
                 host.Start();
-                Console.ReadLine();
+
+                host.WaitForShutdown();
             }
         }
     }

samples/SampleStartups/StartupHelloWorld.cs

@@ -6,26 +6,58 @@
 
 namespace SampleStartups
 {
-    public class StartupHelloWorld : StartupBase
+    public class Program
     {
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public override void Configure(IApplicationBuilder app)
+        public static void Main()
         {
-            app.Run(async (context) =>
-            {
-                await context.Response.WriteAsync("Hello World!");
-            });
+            var host = new WebHostBuilder()
+                .Run(async context =>
+                {
+                    await context.Response.WriteAsync("Hello World");
+                });
+
+            host.WaitForShutdown();
+        }
+
+        public static void MainWithPort()
+        {
+            var host = new WebHostBuilder()
+                .Run(8080, async context =>
+                {
+                    await context.Response.WriteAsync("Hello World");
+                });
+
+            host.WaitForShutdown();
+        }
+
+        public static void MainWithMiddlewareWithPort()
+        {
+            var host = new WebHostBuilder()
+                .RunApplication(8080, app =>
+                {
+                    // You can add middleware here
+                    app.Run(async context =>
+                        {
+                            await context.Response.WriteAsync("Hello World");
+                        });
+                });
+
+            host.WaitForShutdown();
         }
 
-        // Entry point for the application.
-        public static void Main(string[] args)
+        public static void MainWithMiddleware()
         {
             var host = new WebHostBuilder()
-              //.UseKestrel()
-                .UseStartup<StartupHelloWorld>()
-                .Build();
+                .RunApplication(app =>
+                {
+                    // You can add middleware here
+                    app.Run(async context =>
+                    {
+                        await context.Response.WriteAsync("Hello World");
+                    });
+                });
 
-            host.Run();
+            host.WaitForShutdown();
         }
     }
 }

src/Microsoft.AspNetCore.Hosting/WebHostBuilderExtensions.cs

@@ -5,6 +5,7 @@
 using System.Reflection;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Internal;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 
@@ -92,5 +93,59 @@ public static IWebHostBuilder UseDefaultServiceProvider(this IWebHostBuilder hos
                 services.Replace(ServiceDescriptor.Singleton<IServiceProviderFactory<IServiceCollection>>(new DefaultServiceProviderFactory(options)));
             });
         }
+
+        /// <summary>
+        /// Runs a web application with the specified handler
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to run.</param>
+        /// <param name="handler">A delegate that handles the request.</param>
+        public static IWebHost Run(this IWebHostBuilder hostBuilder, RequestDelegate handler)
+        {
+            var host = hostBuilder.Configure(app => app.Run(handler)).Build();
+            host.Start();
+            return host;
+        }
+
+        /// <summary>
+        /// Runs a web application with the specified handler
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to run.</param>
+        /// <param name="port">The port to bind to.</param>
+        /// <param name="handler">A delegate that handles the request.</param>
+        public static IWebHost Run(this IWebHostBuilder hostBuilder, int port, RequestDelegate handler)
+        {
+            var host = hostBuilder.UseUrls($"http://*:{port}/")
+                                  .Configure(app => app.Run(handler))
+                                  .Build();
+            host.Start();
+            return host;
+        }
+
+        /// <summary>
+        /// Runs a web application with the specified handler
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to run.</param>
+        /// <param name="configure">The delegate that configures the <see cref="IApplicationBuilder"/>.</param>
+        public static IWebHost RunApplication(this IWebHostBuilder hostBuilder, Action<IApplicationBuilder> configure)
+        {
+            var host = hostBuilder.Configure(configure).Build();
+            host.Start();
+            return host;
+        }
+
+        /// <summary>
+        /// Runs a web application with the specified handler
+        /// </summary>
+        /// <param name="hostBuilder">The <see cref="IWebHostBuilder"/> to run.</param>
+        /// <param name="port">The port to bind to.</param>
+        /// <param name="configure">The delegate that configures the <see cref="IApplicationBuilder"/>.</param>
+        public static IWebHost RunApplication(this IWebHostBuilder hostBuilder, int port, Action<IApplicationBuilder> configure)
+        {
+            var host = hostBuilder.UseUrls($"http://*:{port}/")
+                                  .Configure(configure)
+                                  .Build();
+            host.Start();
+            return host;
+        }
     }
 }

src/Microsoft.AspNetCore.Hosting/WebHostExtensions.cs

@@ -14,11 +14,86 @@ namespace Microsoft.AspNetCore.Hosting
 {
     public static class WebHostExtensions
     {
+        /// <summary>
+        /// Blocks the calling thread until the web application shuts down.
+        /// </summary>
+        /// <param name="host">The <see cref="IWebHost"/> to wait for shutdown</param>
+        public static void WaitForShutdown(this IWebHost host)
+        {
+            WaitForSystemShutdown(host, (token, message) => host.WaitForShutdown(token, message));
+        }
+
+        /// <summary>
+        /// Blocks the calling thread until the web application shuts down.
+        /// </summary>
+        /// <param name="host">The <see cref="IWebHost"/> to wait for shutdown</param>
+        /// <param name="token">The token to trigger shutdown.</param>
+        public static void WaitForShutdown(this IWebHost host, CancellationToken token)
+        {
+            host.WaitForShutdown(token, shutdownMessage: null);
+        }
+
         /// <summary>
         /// Runs a web application and block the calling thread until host shutdown.
         /// </summary>
         /// <param name="host">The <see cref="IWebHost"/> to run.</param>
         public static void Run(this IWebHost host)
+        {
+            WaitForSystemShutdown(host, (token, message) => host.Run(token, message));
+        }
+
+        /// <summary>
+        /// Runs a web application and block the calling thread until token is triggered or shutdown is triggered.
+        /// </summary>
+        /// <param name="host">The <see cref="IWebHost"/> to run.</param>
+        /// <param name="token">The token to trigger shutdown.</param>
+        public static void Run(this IWebHost host, CancellationToken token)
+        {
+            host.Run(token, shutdownMessage: null);
+        }
+
+        private static void Run(this IWebHost host, CancellationToken token, string shutdownMessage)
+        {
+            using (host)
+            {
+                host.Start();
+
+                host.WaitForShutdown(token, shutdownMessage);
+            }
+        }
+
+        private static void WaitForShutdown(this IWebHost host, CancellationToken token, string shutdownMessage)
+        {
+            var hostingEnvironment = host.Services.GetService<IHostingEnvironment>();
+            var applicationLifetime = host.Services.GetService<IApplicationLifetime>();
+
+            Console.WriteLine($"Hosting environment: {hostingEnvironment.EnvironmentName}");
+            Console.WriteLine($"Content root path: {hostingEnvironment.ContentRootPath}");
+
+            var serverAddresses = host.ServerFeatures.Get<IServerAddressesFeature>()?.Addresses;
+            if (serverAddresses != null)
+            {
+                foreach (var address in serverAddresses)
+                {
+                    Console.WriteLine($"Now listening on: {address}");
+                }
+            }
+
+            if (!string.IsNullOrEmpty(shutdownMessage))
+            {
+                Console.WriteLine(shutdownMessage);
+            }
+
+            token.Register(state =>
+            {
+                ((IApplicationLifetime)state).StopApplication();
+            },
+            applicationLifetime);
+
+            applicationLifetime.ApplicationStopping.WaitHandle.WaitOne();
+        }
+
+        private static void WaitForSystemShutdown(this IWebHost host, Action<CancellationToken, string> execute)
         {
             var done = new ManualResetEventSlim(false);
             using (var cts = new CancellationTokenSource())
@@ -48,55 +123,9 @@ public static void Run(this IWebHost host)
                     eventArgs.Cancel = true;
                 };
 
-                host.Run(cts.Token, "Application started. Press Ctrl+C to shut down.");
+                execute(cts.Token, "Application started. Press Ctrl+C to shut down.");
                 done.Set();
             }
         }
-
-        /// <summary>
-        /// Runs a web application and block the calling thread until token is triggered or shutdown is triggered.
-        /// </summary>
-        /// <param name="host">The <see cref="IWebHost"/> to run.</param>
-        /// <param name="token">The token to trigger shutdown.</param>
-        public static void Run(this IWebHost host, CancellationToken token)
-        {
-            host.Run(token, shutdownMessage: null);
-        }
-
-        private static void Run(this IWebHost host, CancellationToken token, string shutdownMessage)
-        {
-            using (host)
-            {
-                host.Start();
-
-                var hostingEnvironment = host.Services.GetService<IHostingEnvironment>();
-                var applicationLifetime = host.Services.GetService<IApplicationLifetime>();
-
-                Console.WriteLine($"Hosting environment: {hostingEnvironment.EnvironmentName}");
-                Console.WriteLine($"Content root path: {hostingEnvironment.ContentRootPath}");
-
-                var serverAddresses = host.ServerFeatures.Get<IServerAddressesFeature>()?.Addresses;
-                if (serverAddresses != null)
-                {
-                    foreach (var address in serverAddresses)
-                    {
-                        Console.WriteLine($"Now listening on: {address}");
-                    }
-                }
-
-                if (!string.IsNullOrEmpty(shutdownMessage))
-                {
-                    Console.WriteLine(shutdownMessage);
-                }
-
-                token.Register(state =>
-                {
-                    ((IApplicationLifetime)state).StopApplication();
-                },
-                applicationLifetime);
-
-                applicationLifetime.ApplicationStopping.WaitHandle.WaitOne();
-            }
-        }
     }
 }