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

Do not add IHttpContextAccessor to DI by default

This commit is contained in:
Pavel Krymets 2015-11-11 14:23:59 -08:00
parent 2f2ca234a5
commit 7c8b37bcc7
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Microsoft.AspNet.Hosting/WebHostBuilder.cs
View File

@ -75,7 +75,6 @@ namespace Microsoft.AspNet.Hosting
services.AddTransient<IServerLoader, ServerLoader>();
services.AddTransient<IApplicationBuilderFactory, ApplicationBuilderFactory>();
services.AddTransient<IHttpContextFactory, HttpContextFactory>();
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddLogging();
var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");

15
test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs
View File

@ -13,6 +13,7 @@ using Microsoft.AspNet.Hosting.Startup;
using Microsoft.AspNet.Http;
using Microsoft.AspNet.Http.Features;
using Microsoft.AspNet.Http.Features.Internal;
using Microsoft.AspNet.Http.Internal;
using Microsoft.AspNet.Testing.xunit;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
@ -289,6 +290,10 @@ namespace Microsoft.AspNet.TestHost
[Fact]
public async Task CanAccessHttpContext()
{
Action<IServiceCollection> configureServices = services =>
{
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
};
TestServer server = TestServer.Create(app =>
{
app.Run(context =>
@ -296,7 +301,7 @@ namespace Microsoft.AspNet.TestHost
var accessor = app.ApplicationServices.GetRequiredService<IHttpContextAccessor>();
return context.Response.WriteAsync("HasContext:"+(accessor.HttpContext != null));
});
});
}, configureServices);
string result = await server.CreateClient().GetStringAsync("/path");
Assert.Equal("HasContext:True", result);
@ -315,6 +320,11 @@ namespace Microsoft.AspNet.TestHost
[Fact]
public async Task CanAddNewHostServices()
{
Action<IServiceCollection> configureServices = services =>
{
services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
services.AddSingleton<ContextHolder>();
};
TestServer server = TestServer.Create(app =>
{
app.Run(context =>
@ -322,8 +332,7 @@ namespace Microsoft.AspNet.TestHost
var accessor = app.ApplicationServices.GetRequiredService<ContextHolder>();
return context.Response.WriteAsync("HasContext:" + (accessor.Accessor.HttpContext != null));
});
},
services => services.AddSingleton<ContextHolder>());
}, configureServices);
string result = await server.CreateClient().GetStringAsync("/path");
Assert.Equal("HasContext:True", result);