From cabb9f9afc0b48615c677741898329ef2b2aab0b Mon Sep 17 00:00:00 2001
From: Ian Griffiths <Ian.Griffiths@endjin.com>
Date: Fri, 13 Jan 2023 12:08:08 +0000
Subject: [PATCH] Add ability to stop in-memory hosts

---
 .../OpenApiWebHostManager.cs                      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Solutions/Menes.Testing.AspNetCoreSelfHosting/Menes/Testing/AspNetCoreSelfHosting/OpenApiWebHostManager.cs b/Solutions/Menes.Testing.AspNetCoreSelfHosting/Menes/Testing/AspNetCoreSelfHosting/OpenApiWebHostManager.cs
index 193a3e42..0e3173ae 100644
--- a/Solutions/Menes.Testing.AspNetCoreSelfHosting/Menes/Testing/AspNetCoreSelfHosting/OpenApiWebHostManager.cs
+++ b/Solutions/Menes.Testing.AspNetCoreSelfHosting/Menes/Testing/AspNetCoreSelfHosting/OpenApiWebHostManager.cs
@@ -59,7 +59,7 @@ public class OpenApiWebHostManager
         /// your startup class has executed. You can use this to swap out services for stubs or fakes.
         /// </param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
+        public Task<IWebHost> StartInProcessFunctionsHostAsync<TFunctionStartup>(
             string baseUrl,
             Action<IServiceCollection>? additionalServiceConfigurationCallback = null)
             where TFunctionStartup : class, IWebJobsStartup, new()
@@ -78,7 +78,7 @@ public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
         /// your startup class has executed. You can use this to swap out services for stubs or fakes.
         /// </param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
+        public Task<IWebHost> StartInProcessFunctionsHostAsync<TFunctionStartup>(
             string baseUrl,
             IConfiguration configuration,
             Action<IServiceCollection>? additionalServiceConfigurationCallback = null)
@@ -98,7 +98,7 @@ public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
         /// your startup class has executed. You can use this to swap out services for stubs or fakes.
         /// </param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
+        public Task<IWebHost> StartInProcessFunctionsHostAsync<TFunctionStartup>(
             TFunctionStartup startupInstance,
             string baseUrl,
             Action<IServiceCollection>? additionalServiceConfigurationCallback = null)
@@ -136,7 +136,7 @@ public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
         /// your startup class has executed. You can use this to swap out services for stubs or fakes.
         /// </param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
+        public Task<IWebHost> StartInProcessFunctionsHostAsync<TFunctionStartup>(
             TFunctionStartup startupInstance,
             string baseUrl,
             IConfiguration configuration,
@@ -184,7 +184,7 @@ public Task StartInProcessFunctionsHostAsync<TFunctionStartup>(
         /// because that's the only way to ensure that your configuration will run after Startup. (The ASP.NET
         /// web host startup prefers to run the Startup methods after all other configuration has occurred.)
         /// </remarks>
-        public Task StartInProcessAspNetHostAsync<TStartup>(
+        public Task<IWebHost> StartInProcessAspNetHostAsync<TStartup>(
             string baseUrl,
             TStartup startupInstance)
             where TStartup : class
@@ -217,7 +217,7 @@ public async Task StopAllHostsAsync()
         /// A callback that will allow you to configure the <see cref="IWebHostBuilder"/> for your service.
         /// </param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        private Task StartAspNetHostAsync(
+        private async Task<IWebHost> StartAspNetHostAsync(
             string baseUrl,
             Action<IServiceCollection> serviceConfigurationCallback,
             Action<IWebHostBuilder> webHostBuilderCallback)
@@ -242,7 +242,8 @@ private Task StartAspNetHostAsync(
 
             this.webHosts.Add(host);
 
-            return host.StartAsync();
+            await host.StartAsync();
+            return host;
         }
     }
 }
\ No newline at end of file