huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make WebHost internal 

To avoid conflict with WebHost defined in Microsoft.AspNetCore in MetaPackages
This commit is contained in:
John Luo 2017-04-23 00:59:49 -07:00
parent 7d0770b0e4
commit d2816d14ab
3 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNetCore.Hosting/Internal/WebHost.cs
View File

@ -23,7 +23,7 @@ using Microsoft.Extensions.StackTrace.Sources;
namespace Microsoft.AspNetCore.Hosting.Internal namespace Microsoft.AspNetCore.Hosting.Internal
{ {
public class WebHost : IWebHost internal class WebHost : IWebHost
{ {
private static readonly string DeprecatedServerUrlsKey = "server.urls"; private static readonly string DeprecatedServerUrlsKey = "server.urls";

25
test/Microsoft.AspNetCore.TestHost.Tests/ClientHandlerTests.cs
View File

@ -9,7 +9,6 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Hosting.Internal;
using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Hosting.Server;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features; 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 // This logger will attempt to access information from HttpRequest once the HttpContext is created
var logger = new VerifierLogger(); var logger = new VerifierLogger();
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddSingleton<ILogger<WebHost>>(logger); services.AddSingleton<ILogger<IWebHost>>(logger);
}) })
.Configure(app => .Configure(app =>
{ {
app.Run(context => app.Run(context =>
{ {
return Task.FromResult(0); return Task.FromResult(0);
}); });
}); });
var server = new TestServer(builder); var server = new TestServer(builder);
// The HttpContext will be created and the logger will make sure that the HttpRequest exists and contains reasonable values // 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("/"); var result = await server.CreateClient().GetStringAsync("/");
} }
private class VerifierLogger : ILogger<WebHost> private class VerifierLogger : ILogger<IWebHost>
{ {
public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble(); public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();

6
test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
View File

@ -174,7 +174,7 @@ namespace Microsoft.AspNetCore.TestHost
{ {
// Arrange // Arrange
// This logger will attempt to access information from HttpRequest once the HttpContext is createds // 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 => RequestDelegate appDelegate = async ctx =>
{ {
if (ctx.WebSockets.IsWebSocketRequest) if (ctx.WebSockets.IsWebSocketRequest)
@ -200,7 +200,7 @@ namespace Microsoft.AspNetCore.TestHost
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.ConfigureServices(services => .ConfigureServices(services =>
{ {
services.AddSingleton<ILogger<WebHost>>(logger); services.AddSingleton<ILogger<IWebHost>>(logger);
}) })
.Configure(app => .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(); public IDisposable BeginScope<TState>(TState state) => new NoopDispoasble();