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

Reacting to DependencyInjection changes

This commit is contained in:
Pranav K 2015-11-13 11:04:43 -08:00
parent 0692ebe628
commit 8341c6a944
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs
View File

@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Hosting.Internal
_startupLoader = startupLoader; _startupLoader = startupLoader;
_captureStartupErrors = captureStartupErrors; _captureStartupErrors = captureStartupErrors;
_applicationLifetime = new ApplicationLifetime(); _applicationLifetime = new ApplicationLifetime();
_applicationServiceCollection.AddInstance<IApplicationLifetime>(_applicationLifetime); _applicationServiceCollection.AddSingleton<IApplicationLifetime>(_applicationLifetime);
} }
public IServiceProvider ApplicationServices public IServiceProvider ApplicationServices

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

@ -67,8 +67,8 @@ namespace Microsoft.AspNet.Hosting
private IServiceCollection BuildHostingServices() private IServiceCollection BuildHostingServices()
{ {
var services = new ServiceCollection(); var services = new ServiceCollection();
services.AddInstance(_hostingEnvironment); services.AddSingleton(_hostingEnvironment);
services.AddInstance(_loggerFactory); services.AddSingleton(_loggerFactory);
services.AddTransient<IStartupLoader, StartupLoader>(); services.AddTransient<IStartupLoader, StartupLoader>();
@ -79,8 +79,8 @@ namespace Microsoft.AspNet.Hosting
services.AddLogging(); services.AddLogging();
var diagnosticSource = new DiagnosticListener("Microsoft.AspNet"); var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");
services.AddInstance<DiagnosticSource>(diagnosticSource); services.AddSingleton<DiagnosticSource>(diagnosticSource);
services.AddInstance<DiagnosticListener>(diagnosticSource); services.AddSingleton<DiagnosticListener>(diagnosticSource);
// Conjure up a RequestServices // Conjure up a RequestServices
services.AddTransient<IStartupFilter, AutoRequestServicesStartupFilter>(); services.AddTransient<IStartupFilter, AutoRequestServicesStartupFilter>();

10
test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs
View File

@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupClassMayHaveHostingServicesInjected() public void StartupClassMayHaveHostingServicesInjected()
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IFakeStartupCallback>(this); serviceCollection.AddSingleton<IFakeStartupCallback>(this);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var diagnosticMessages = new List<string>(); var diagnosticMessages = new List<string>();
@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupWithNoConfigureThrows() public void StartupWithNoConfigureThrows()
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IFakeStartupCallback>(this); serviceCollection.AddSingleton<IFakeStartupCallback>(this);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var diagnosticMessages = new List<string>(); var diagnosticMessages = new List<string>();
@ -87,7 +87,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupWithTwoConfiguresThrows() public void StartupWithTwoConfiguresThrows()
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IFakeStartupCallback>(this); serviceCollection.AddSingleton<IFakeStartupCallback>(this);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var diagnosticMessages = new List<string>(); var diagnosticMessages = new List<string>();
@ -103,7 +103,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupWithPrivateConfiguresThrows() public void StartupWithPrivateConfiguresThrows()
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IFakeStartupCallback>(this); serviceCollection.AddSingleton<IFakeStartupCallback>(this);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var diagnosticMessages = new List<string>(); var diagnosticMessages = new List<string>();
@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupWithTwoConfigureServicesThrows() public void StartupWithTwoConfigureServicesThrows()
{ {
var serviceCollection = new ServiceCollection(); var serviceCollection = new ServiceCollection();
serviceCollection.AddInstance<IFakeStartupCallback>(this); serviceCollection.AddSingleton<IFakeStartupCallback>(this);
var services = serviceCollection.BuildServiceProvider(); var services = serviceCollection.BuildServiceProvider();
var diagnosticMessages = new List<string>(); var diagnosticMessages = new List<string>();

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

@ -203,7 +203,7 @@ namespace Microsoft.AspNet.TestHost
return context.Response.WriteAsync("Success"); return context.Response.WriteAsync("Success");
}); });
}, },
services => services.AddInstance<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices))); services => services.AddSingleton<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices)));
var result = await server.CreateClient().GetStringAsync("/path"); var result = await server.CreateClient().GetStringAsync("/path");
Assert.Equal("Success", result); Assert.Equal("Success", result);
} }