#947 Add IServer.Stop

Author: Tratcher

src/Microsoft.AspNetCore.Hosting.Server.Abstractions/IServer.cs

@@ -22,5 +22,10 @@ public interface IServer : IDisposable
         /// <param name="application">An instance of <see cref="IHttpApplication{TContext}"/>.</param>
         /// <typeparam name="TContext">The context associated with the application.</typeparam>
         void Start<TContext>(IHttpApplication<TContext> application);
+
+        /// <summary>
+        /// Stop processing requests and shut down the server, gracefully if possible.
+        /// </summary>
+        void Stop();
     }
 }

src/Microsoft.AspNetCore.Hosting.Server.Abstractions/exceptions.net45.json

@@ -10,5 +10,11 @@
     "NewTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature",
     "NewMemberId": "System.Void set_PreferHostingUrls(System.Boolean value)",
     "Kind": "Addition"
+  },
+  {
+    "OldTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.IServer : System.IDisposable",
+    "NewTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.IServer : System.IDisposable",
+    "NewMemberId": "System.Void Stop()",
+    "Kind": "Addition"
   }
 ]

src/Microsoft.AspNetCore.Hosting.Server.Abstractions/exceptions.netcore.json

@@ -10,5 +10,11 @@
     "NewTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature",
     "NewMemberId": "System.Void set_PreferHostingUrls(System.Boolean value)",
     "Kind": "Addition"
+  },
+  {
+    "OldTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.IServer : System.IDisposable",
+    "NewTypeId": "public interface Microsoft.AspNetCore.Hosting.Server.IServer : System.IDisposable",
+    "NewMemberId": "System.Void Stop()",
+    "Kind": "Addition"
   }
 ]

src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs

@@ -274,6 +274,8 @@ public void Dispose()
             // Fire IApplicationLifetime.Stopping
             _applicationLifetime?.StopApplication();
 
+            Server?.Stop();
+
             // Fire the IHostedService.Stop
             _hostedServiceExecutor?.Stop();
 

src/Microsoft.AspNetCore.TestHost/TestServer.cs

@@ -102,6 +102,10 @@ void IServer.Start<TContext>(IHttpApplication<TContext> application)
             });
         }
 
+        void IServer.Stop()
+        {
+        }
+
         private class ApplicationWrapper<TContext> : IHttpApplication<TContext>
         {
             private readonly IHttpApplication<TContext> _application;

test/Microsoft.AspNetCore.Hosting.TestSites/Program.cs

@@ -2,10 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Configuration;
-using System.Threading;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http.Features;
+using Microsoft.Extensions.Configuration;
 
 namespace ServerComparison.TestSites
 {
@@ -39,6 +38,10 @@ public void Dispose()
         public void Start<TContext>(IHttpApplication<TContext> application)
         {
         }
+
+        public void Stop()
+        {
+        }
     }
 }
 

test/Microsoft.AspNetCore.Hosting.Tests/WebHostBuilderTests.cs

@@ -896,6 +896,11 @@ public void Start<TContext>(IHttpApplication<TContext> application)
                     application.DisposeContext(httpContext, null);
                 };
             }
+
+            public void Stop()
+            {
+
+            }
         }
 
         internal class StartupVerifyServiceA : IStartup

test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs

@@ -819,6 +819,17 @@ public void Start<TContext>(IHttpApplication<TContext> application)
             application.DisposeContext(context, null);
         }
 
+        public void Stop()
+        {
+            if (_startInstances != null)
+            {
+                foreach (var startInstance in _startInstances)
+                {
+                    startInstance.Stop();
+                }
+            }
+        }
+
         public void Dispose()
         {
             if (_startInstances != null)
@@ -871,8 +882,15 @@ public DelegateHostedService(Action started, Action stopping)
 
         private class StartInstance : IDisposable
         {
+            public int StopCalls { get; set; }
+
             public int DisposeCalls { get; set; }
 
+            public void Stop()
+            {
+                StopCalls += 1;
+            }
+
             public void Dispose()
             {
                 DisposeCalls += 1;