From 8341c6a944326c95485670f72e4de52423721eac Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 13 Nov 2015 11:04:43 -0800
Subject: [PATCH] Reacting to DependencyInjection changes

---
 src/Microsoft.AspNet.Hosting/Internal/HostingEngine.cs |  2 +-
 src/Microsoft.AspNet.Hosting/WebHostBuilder.cs         |  8 ++++----
 .../StartupManagerTests.cs                             | 10 +++++-----
 .../Microsoft.AspNet.TestHost.Tests/TestServerTests.cs |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

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<IApplicationLifetime>(_applicationLifetime);
+            _applicationServiceCollection.AddSingleton<IApplicationLifetime>(_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<IStartupLoader, StartupLoader>();
 
@@ -79,8 +79,8 @@ namespace Microsoft.AspNet.Hosting
             services.AddLogging();
 
             var diagnosticSource = new DiagnosticListener("Microsoft.AspNet");
-            services.AddInstance<DiagnosticSource>(diagnosticSource);
-            services.AddInstance<DiagnosticListener>(diagnosticSource);
+            services.AddSingleton<DiagnosticSource>(diagnosticSource);
+            services.AddSingleton<DiagnosticListener>(diagnosticSource);
 
             // Conjure up a RequestServices
             services.AddTransient<IStartupFilter, AutoRequestServicesStartupFilter>();
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<IFakeStartupCallback>(this);
+            serviceCollection.AddSingleton<IFakeStartupCallback>(this);
             var services = serviceCollection.BuildServiceProvider();
 
             var diagnosticMessages = new List<string>();
@@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Hosting.Tests
         public void StartupWithNoConfigureThrows()
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IFakeStartupCallback>(this);
+            serviceCollection.AddSingleton<IFakeStartupCallback>(this);
             var services = serviceCollection.BuildServiceProvider();
 
             var diagnosticMessages = new List<string>();
@@ -87,7 +87,7 @@ namespace Microsoft.AspNet.Hosting.Tests
         public void StartupWithTwoConfiguresThrows()
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IFakeStartupCallback>(this);
+            serviceCollection.AddSingleton<IFakeStartupCallback>(this);
             var services = serviceCollection.BuildServiceProvider();
 
             var diagnosticMessages = new List<string>();
@@ -103,7 +103,7 @@ namespace Microsoft.AspNet.Hosting.Tests
         public void StartupWithPrivateConfiguresThrows()
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IFakeStartupCallback>(this);
+            serviceCollection.AddSingleton<IFakeStartupCallback>(this);
             var services = serviceCollection.BuildServiceProvider();
 
             var diagnosticMessages = new List<string>();
@@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Hosting.Tests
         public void StartupWithTwoConfigureServicesThrows()
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddInstance<IFakeStartupCallback>(this);
+            serviceCollection.AddSingleton<IFakeStartupCallback>(this);
             var services = serviceCollection.BuildServiceProvider();
 
             var diagnosticMessages = new List<string>();
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<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices)));
+            services => services.AddSingleton<IStartupFilter>(new ReplaceServiceProvidersFeatureFilter(appServices, appServices)));
             var result = await server.CreateClient().GetStringAsync("/path");
             Assert.Equal("Success", result);
         }