From d2816d14ab15b11334cadb3f2bdf20492ccbae50 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Sun, 23 Apr 2017 00:59:49 -0700
Subject: [PATCH] Make WebHost internal

To avoid conflict with WebHost defined in Microsoft.AspNetCore in MetaPackages
---
 .../Internal/WebHost.cs                       |  2 +-
 .../ClientHandlerTests.cs                     | 25 +++++++++----------
 .../TestClientTests.cs                        |  6 ++---
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
index 5d08a6fec7..18cf548932 100644
--- a/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
+++ b/src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
@@ -23,7 +23,7 @@ using Microsoft.Extensions.StackTrace.Sources;
 
 namespace Microsoft.AspNetCore.Hosting.Internal
 {
-    public class WebHost : IWebHost
+    internal class WebHost : IWebHost
     {
         private static readonly string DeprecatedServerUrlsKey = "server.urls";
 
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
index ffb1d7a679..6f57a5fdb7 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
@@ -9,7 +9,6 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
@@ -336,24 +335,24 @@ namespace Microsoft.AspNetCore.TestHost
             // This logger will attempt to access information from HttpRequest once the HttpContext is created
             var logger = new VerifierLogger();
             var builder = new WebHostBuilder()
-                            .ConfigureServices(services =>
-                            {
-                                services.AddSingleton<ILogger<WebHost>>(logger);
-                            })
-                            .Configure(app =>
-                            {
-                                app.Run(context =>
-                                {
-                                    return Task.FromResult(0);
-                                });
-                            });
+                .ConfigureServices(services =>
+                {
+                    services.AddSingleton<ILogger<IWebHost>>(logger);
+                })
+                .Configure(app =>
+                {
+                    app.Run(context =>
+                    {
+                        return Task.FromResult(0);
+                    });
+                });
             var server = new TestServer(builder);
 
             // The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values
             var result = await server.CreateClient().GetStringAsync("/");
         }
 
-        private class VerifierLogger : ILogger<WebHost>
+        private class VerifierLogger : ILogger<IWebHost>
         {
             public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();
 
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs b/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
index 1808b26b52..283d60ccd9 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
@@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.TestHost
         {
             // Arrange
             // This logger will attempt to access information from HttpRequest once the HttpContext is createds
-            var logger = new VerifierLogger(); 
+            var logger = new VerifierLogger();
             RequestDelegate appDelegate = async ctx =>
             {
                 if (ctx.WebSockets.IsWebSocketRequest)
@@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.TestHost
             var builder = new WebHostBuilder()
                 .ConfigureServices(services =>
                 {
-                    services.AddSingleton<ILogger<WebHost>>(logger);
+                    services.AddSingleton<ILogger<IWebHost>>(logger);
                 })
                 .Configure(app =>
                 {
@@ -240,7 +240,7 @@ namespace Microsoft.AspNetCore.TestHost
         }
 
 
-        private class VerifierLogger : ILogger<WebHost>
+        private class VerifierLogger : ILogger<IWebHost>
         {
             public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();