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

Renaming DefaultServices to GetDefaultServices

This commit is contained in:
Louis DeJardin 2014-02-10 17:57:44 -08:00
parent 0e813fbb79
commit f59d29b5eb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Microsoft.AspNet.Hosting/HostingServices.cs
View File

@ -10,12 +10,12 @@ namespace Microsoft.AspNet.Hosting
{ {
public static class HostingServices public static class HostingServices
{ {
public static IEnumerable<IServiceDescriptor> DefaultServices() public static IEnumerable<IServiceDescriptor> GetDefaultServices()
{ {
return DefaultServices(new EmptyConfiguration()); return GetDefaultServices(new EmptyConfiguration());
} }
public static IEnumerable<IServiceDescriptor> DefaultServices(IConfiguration configuration) public static IEnumerable<IServiceDescriptor> GetDefaultServices(IConfiguration configuration)
{ {
yield return DescribeService<IHostingEngine, HostingEngine>(configuration); yield return DescribeService<IHostingEngine, HostingEngine>(configuration);
yield return DescribeService<IServerFactoryProvider, ServerFactoryProvider>(configuration); yield return DescribeService<IServerFactoryProvider, ServerFactoryProvider>(configuration);

2
src/Microsoft.AspNet.Hosting/WebApplication.cs
View File

@ -9,7 +9,7 @@ namespace Microsoft.AspNet.Hosting
{ {
var context = new HostingContext var context = new HostingContext
{ {
Services = new ServiceProvider().Add(HostingServices.DefaultServices()) Services = new ServiceProvider().Add(HostingServices.GetDefaultServices())
}; };
var engine = context.Services.GetService<IHostingEngine>(); var engine = context.Services.GetService<IHostingEngine>();

4
test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
View File

@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void HostingEngineCanBeResolvedWithDefaultServices() public void HostingEngineCanBeResolvedWithDefaultServices()
{ {
var services = new ServiceProvider() var services = new ServiceProvider()
.Add(HostingServices.DefaultServices()); .Add(HostingServices.GetDefaultServices());
var engine = services.GetService<IHostingEngine>(); var engine = services.GetService<IHostingEngine>();
@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void HostingEngineCanBeStarted() public void HostingEngineCanBeStarted()
{ {
var services = new ServiceProvider() var services = new ServiceProvider()
.Add(HostingServices.DefaultServices() .Add(HostingServices.GetDefaultServices()
.Where(descriptor => descriptor.ServiceType != typeof(IServerManager))) .Where(descriptor => descriptor.ServiceType != typeof(IServerManager)))
.AddInstance<IServerManager>(this); .AddInstance<IServerManager>(this);

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

@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Hosting.Tests
[Fact] [Fact]
public void DefaultServicesLocateStartupByNameAndNamespace() public void DefaultServicesLocateStartupByNameAndNamespace()
{ {
IServiceProvider services = new ServiceProvider().Add(HostingServices.DefaultServices()); IServiceProvider services = new ServiceProvider().Add(HostingServices.GetDefaultServices());
var manager = services.GetService<IStartupManager>(); var manager = services.GetService<IStartupManager>();
@ -31,7 +31,7 @@ namespace Microsoft.AspNet.Hosting.Tests
public void StartupClassMayHaveHostingServicesInjected() public void StartupClassMayHaveHostingServicesInjected()
{ {
IServiceProvider services = new ServiceProvider() IServiceProvider services = new ServiceProvider()
.Add(HostingServices.DefaultServices()) .Add(HostingServices.GetDefaultServices())
.AddInstance<IFakeStartupCallback>(this); .AddInstance<IFakeStartupCallback>(this);
var manager = services.GetService<IStartupManager>(); var manager = services.GetService<IStartupManager>();