[IIS] Move to GenericHost (#24280)

Author: Kahbazi

src/Servers/IIS/IIS/samples/NativeIISSample/Startup.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
@@ -12,6 +13,7 @@
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.IIS;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 
 namespace NativeIISSample
 {
@@ -115,16 +117,20 @@ public void Configure(IApplicationBuilder app)
             "WEBSOCKET_VERSION"
         };
 
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = new WebHostBuilder()
-                .UseKestrel()
-                .UseIIS()
-                .UseIISIntegration()
-                .UseStartup<Startup>()
+            var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseKestrel()
+                        .UseIIS()
+                        .UseIISIntegration()
+                        .UseStartup<Startup>();
+                })
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }

src/Servers/IIS/IIS/test/IIS.Tests/Utilities/TestServer.cs

@@ -23,7 +23,7 @@
 
 namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
 {
-    public class TestServer: IDisposable, IStartup
+    public class TestServer : IDisposable
     {
         private const string InProcessHandlerDll = "aspnetcorev2_inprocess.dll";
         private const string AspNetCoreModuleDll = "aspnetcorev2.dll";
@@ -51,7 +51,7 @@ public class TestServer: IDisposable, IStartup
         public TestConnection CreateConnection() => new TestConnection(_currentPort);
 
         private static IISServerOptions _options;
-        private IWebHost _host;
+        private IHost _host;
 
         private string _appHostConfigPath;
         private int _currentPort;
@@ -131,16 +131,24 @@ private void InitializeConfig(int port)
 
         private int Main(IntPtr argc, IntPtr argv)
         {
-            var builder = new WebHostBuilder()
-                .UseIIS()
-                .ConfigureServices(services =>
+            _host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
                 {
-                    services.Configure<IISServerOptions>(options => options.MaxRequestBodySize = _options.MaxRequestBodySize);
-                    services.AddSingleton<IStartup>(this);
-                    services.AddSingleton(_loggerFactory);
+                    webHostBuilder
+                        .UseIIS()
+                        .UseSetting(WebHostDefaults.ApplicationKey, typeof(TestServer).GetTypeInfo().Assembly.FullName)
+                        .Configure(app =>
+                        {
+                            app.Map("/start", builder => builder.Run(context => context.Response.WriteAsync("Done")));
+                            _appBuilder(app);
+                        })
+                        .ConfigureServices(services =>
+                        {
+                            services.Configure<IISServerOptions>(options => options.MaxRequestBodySize = _options.MaxRequestBodySize);
+                            services.AddSingleton(_loggerFactory);
+                        });
                 })
-                .UseSetting(WebHostDefaults.ApplicationKey, typeof(TestServer).GetTypeInfo().Assembly.FullName);
-            _host = builder.Build();
+                .Build();
 
             var doneEvent = new ManualResetEventSlim();
             var lifetime = _host.Services.GetService<IHostApplicationLifetime>();
@@ -167,17 +175,6 @@ public void Dispose()
             WebCoreLock.Release();
         }
 
-        public IServiceProvider ConfigureServices(IServiceCollection services)
-        {
-            return services.BuildServiceProvider();
-        }
-
-        public void Configure(IApplicationBuilder app)
-        {
-            app.Map("/start", builder => builder.Run(context => context.Response.WriteAsync("Done")));
-            _appBuilder(app);
-        }
-
         private delegate int hostfxr_main_fn(IntPtr argc, IntPtr argv);
 
         [DllImport(HWebCoreDll)]
@@ -195,7 +192,7 @@ private static extern int WebCoreActivate(
         [DllImport(InProcessHandlerDll)]
         private static extern int set_main_handler(hostfxr_main_fn main);
 
-        [DllImport("kernel32", SetLastError=true, CharSet = CharSet.Ansi)]
+        [DllImport("kernel32", SetLastError = true, CharSet = CharSet.Ansi)]
         private static extern IntPtr LoadLibrary([MarshalAs(UnmanagedType.LPStr)] string lpFileName);
 
         private void Retry(Action func, int attempts)

src/Servers/IIS/IISIntegration/samples/IISSample/Startup.cs

@@ -3,13 +3,15 @@
 
 using System;
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Server.IISIntegration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 namespace IISSample
@@ -88,19 +90,23 @@ public void Configure(IApplicationBuilder app, ILoggerFactory loggerfactory, IAu
             });
         }
 
-        public static void Main(string[] args)
+        public static Task Main(string[] args)
         {
-            var host = new WebHostBuilder()
+            var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuidler =>
+                {
+                    webHostBuidler
+                        .UseKestrel()
+                        .UseStartup<Startup>();
+                })
                 .ConfigureLogging((_, factory) =>
                 {
                     factory.AddConsole();
                     factory.AddFilter("Console", level => level >= LogLevel.Debug);
                 })
-                .UseKestrel()
-                .UseStartup<Startup>()
                 .Build();
 
-            host.Run();
+            return host.RunAsync();
         }
     }
 }

src/Servers/IIS/IISIntegration/test/Tests/IISExtensionTests.cs

@@ -2,29 +2,39 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Server.IISIntegration
 {
     public class IISExtensionTests
     {
         [Fact]
-        public void CallingUseIISIntegrationMultipleTimesWorks()
+        public async Task CallingUseIISIntegrationMultipleTimesWorks()
         {
+            using var host = new HostBuilder()
+                .ConfigureWebHost(webHostBuilder =>
+                {
+                    webHostBuilder
+                        .UseSetting("TOKEN", "TestToken")
+                        .UseSetting("PORT", "12345")
+                        .UseSetting("APPL_PATH", "/")
+                        .UseIISIntegration()
+                        .UseIISIntegration()
+                        .Configure(app => { })
+                        .UseTestServer();
+                })
+                .Build();
 
-            var builder = new WebHostBuilder()
-                .UseSetting("TOKEN", "TestToken")
-                .UseSetting("PORT", "12345")
-                .UseSetting("APPL_PATH", "/")
-                .UseIISIntegration()
-                .UseIISIntegration()
-                .Configure(app => { });
-            var server = new TestServer(builder);
+            var server = host.GetTestServer();
 
-            var filters = server.Host.Services.GetServices<IStartupFilter>()
+            await host.StartAsync();
+
+            var filters = server.Services.GetServices<IStartupFilter>()
                 .OfType<IISSetupFilter>();
 
             Assert.Single(filters);