diff --git a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs index 4b304c152a..2a5ef5f534 100644 --- a/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs +++ b/src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs @@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Hosting.Internal _startupLoader = startupLoader; _captureStartupErrors = captureStartupErrors; _applicationLifetime = new ApplicationLifetime(); - _applicationServiceCollection.AddInstance(_applicationLifetime); + _applicationServiceCollection.AddSingleton(_applicationLifetime); } public IServiceProvider ApplicationServices diff --git a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs index f60c32fb32..ca52616b35 100644 --- a/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs +++ b/src/Microsoft.AspNet.Hosting/WebHostBuilder.cs @@ -67,8 +67,8 @@ namespace Microsoft.AspNet.Hosting private IServiceCollection BuildHostingServices() { var services = new ServiceCollection(); - services.AddInstance(_hostingEnvironment); - services.AddInstance(_loggerFactory); + services.AddSingleton(_hostingEnvironment); + services.AddSingleton(_loggerFactory); services.AddTransient(); @@ -79,8 +79,8 @@ namespace Microsoft.AspNet.Hosting services.AddLogging(); var diagnosticSource = new DiagnosticListener("Microsoft.AspNet"); - services.AddInstance(diagnosticSource); - services.AddInstance(diagnosticSource); + services.AddSingleton(diagnosticSource); + services.AddSingleton(diagnosticSource); // Conjure up a RequestServices services.AddTransient(); diff --git a/test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs b/test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs index f7d835cd87..0272e66a81 100644 --- a/test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs +++ b/test/Microsoft.AspNet.Hosting.Tests/StartupManagerTests.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Hosting.Tests public void StartupClassMayHaveHostingServicesInjected() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(this); + serviceCollection.AddSingleton(this); var services = serviceCollection.BuildServiceProvider(); var diagnosticMessages = new List(); @@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Hosting.Tests public void StartupWithNoConfigureThrows() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(this); + serviceCollection.AddSingleton(this); var services = serviceCollection.BuildServiceProvider(); var diagnosticMessages = new List(); @@ -87,7 +87,7 @@ namespace Microsoft.AspNet.Hosting.Tests public void StartupWithTwoConfiguresThrows() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(this); + serviceCollection.AddSingleton(this); var services = serviceCollection.BuildServiceProvider(); var diagnosticMessages = new List(); @@ -103,7 +103,7 @@ namespace Microsoft.AspNet.Hosting.Tests public void StartupWithPrivateConfiguresThrows() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(this); + serviceCollection.AddSingleton(this); var services = serviceCollection.BuildServiceProvider(); var diagnosticMessages = new List(); @@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Hosting.Tests public void StartupWithTwoConfigureServicesThrows() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(this); + serviceCollection.AddSingleton(this); var services = serviceCollection.BuildServiceProvider(); var diagnosticMessages = new List(); diff --git a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs index a422818802..06c21fc3f8 100644 --- a/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs +++ b/test/Microsoft.AspNet.TestHost.Tests/TestServerTests.cs @@ -203,7 +203,7 @@ namespace Microsoft.AspNet.TestHost return context.Response.WriteAsync("Success"); }); }, - services => services.AddInstance(new ReplaceServiceProvidersFeatureFilter(appServices, appServices))); + services => services.AddSingleton(new ReplaceServiceProvidersFeatureFilter(appServices, appServices))); var result = await server.CreateClient().GetStringAsync("/path"); Assert.Equal("Success", result); }