From 292207d17d1572ea856fcaf847867730338b7bd2 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Fri, 13 Nov 2015 10:47:34 -0800 Subject: [PATCH] Reacting to DependencyInjection changes --- .../MvcRazorMvcBuilderExtensions.cs | 2 +- .../MvcRazorMvcCoreBuilderExtensions.cs | 2 +- .../ChallengeResultTest.cs | 2 +- .../ContentResultTest.cs | 2 +- .../Controllers/ControllerActionInvokerTest.cs | 2 +- .../CreatedAtActionResultTests.cs | 2 +- .../CreatedAtRouteResultTests.cs | 2 +- .../CreatedResultTests.cs | 2 +- .../FileContentResultTest.cs | 2 +- .../Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs | 2 +- .../FileStreamResultTest.cs | 2 +- .../Filters/AuthorizeFilterTest.cs | 3 +-- .../ForbidResultTest.cs | 2 +- .../HttpNotFoundObjectResultTest.cs | 2 +- .../HttpOkObjectResultTest.cs | 2 +- .../HttpOkResultTest.cs | 2 +- .../HttpStatusCodeResultTests.cs | 2 +- .../Infrastructure/ObjectResultExecutorTest.cs | 2 +- .../LocalRedirectResultTest.cs | 2 +- .../ModelBinding/ServicesModelBinderTest.cs | 2 +- .../ObjectResultTests.cs | 4 ++-- .../PhysicalFileResultTest.cs | 8 ++++---- .../RedirectResultTest.cs | 2 +- .../RedirectToActionResultTest.cs | 2 +- .../RedirectToRouteResultTest.cs | 2 +- .../VirtualFileResultTest.cs | 4 ++-- .../CorsAuthorizationFilterTest.cs | 2 +- .../Infrastructure/JsonResultExecutorTest.cs | 2 +- .../JsonResultTest.cs | 2 +- .../MvcTestFixture.cs | 6 +++--- .../Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs | 10 +++++----- .../PartialViewResultTest.cs | 2 +- .../RemoteAttributeTest.cs | 12 ++++++------ .../ViewComponentResultTest.cs | 8 ++++---- .../ViewFeatures/ViewExecutorTest.cs | 4 ++-- .../ViewResultTest.cs | 2 +- .../BadRequestErrorMessageResultTest.cs | 2 +- .../ConflictResultTest.cs | 2 +- .../ExceptionResultTest.cs | 2 +- .../InternalServerErrorResultTest.cs | 2 +- .../InvalidModelStateResultTest.cs | 2 +- .../NegotiatedContentResultTest.cs | 2 +- test/WebSites/ActionResultsWebSite/Startup.cs | 2 +- test/WebSites/ActivatorWebSite/Startup.cs | 2 +- 44 files changed, 64 insertions(+), 65 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs index 49063081ac..a30068b624 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs @@ -69,7 +69,7 @@ namespace Microsoft.Extensions.DependencyInjection var initializer = new TagHelperInitializer(initialize); - builder.Services.AddInstance(typeof(ITagHelperInitializer), initializer); + builder.Services.AddSingleton(typeof(ITagHelperInitializer), initializer); return builder; } diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs index 15d26bfba0..897a6d9e65 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs @@ -110,7 +110,7 @@ namespace Microsoft.Extensions.DependencyInjection var initializer = new TagHelperInitializer(initialize); - builder.Services.AddInstance(typeof(ITagHelperInitializer), initializer); + builder.Services.AddSingleton(typeof(ITagHelperInitializer), initializer); return builder; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs index d70ae18f46..2be71ca859 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ChallengeResultTest.cs @@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs index 8b18280ca5..59614401e8 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ContentResultTest.cs @@ -182,7 +182,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices(params ViewComponentDescriptor[] descriptors) { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs index 9f99e9b98a..b8efc5419a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Controllers/ControllerActionInvokerTest.cs @@ -2145,7 +2145,7 @@ namespace Microsoft.AspNet.Mvc.Controllers { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs index 98328cf60d..298734f9db 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtActionResultTests.cs @@ -95,7 +95,7 @@ namespace Microsoft.AspNet.Mvc options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs index 01fe35e3b9..c61e561aac 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedAtRouteResultTests.cs @@ -109,7 +109,7 @@ namespace Microsoft.AspNet.Mvc options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs index 1029f2e74e..d063613234 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/CreatedResultTests.cs @@ -96,7 +96,7 @@ namespace Microsoft.AspNet.Mvc options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs index bee4d82d29..cc6508f8dc 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileContentResultTest.cs @@ -107,7 +107,7 @@ namespace Microsoft.AspNet.Mvc { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs index 8356184a9a..528bef5834 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileResultTest.cs @@ -217,7 +217,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs index edd2a31ea5..4058176a15 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/FileStreamResultTest.cs @@ -156,7 +156,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs index 0f98d78566..54d800ad18 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Filters/AuthorizeFilterTest.cs @@ -213,8 +213,7 @@ namespace Microsoft.AspNet.Mvc.Filters .RequireClaim("Permission", "CanViewComment") .Build()); var authorizationContext = GetAuthorizationContext(services => - services.AddInstance(authorizationService.Object) - ); + services.AddSingleton(authorizationService.Object)); authorizationContext.Result = new HttpUnauthorizedResult(); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ForbidResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ForbidResultTest.cs index f9ac598dcf..8809195827 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ForbidResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ForbidResultTest.cs @@ -147,7 +147,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceProvider CreateServices() { return new ServiceCollection() - .AddInstance(NullLoggerFactory.Instance) + .AddSingleton(NullLoggerFactory.Instance) .BuildServiceProvider(); } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs index 481398d5b1..afefe2051c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs @@ -72,7 +72,7 @@ namespace Microsoft.AspNet.Mvc options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs index 135ca9044b..e59e4baf3e 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkObjectResultTest.cs @@ -76,7 +76,7 @@ namespace Microsoft.AspNet.Mvc options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs index 43aa121c18..b224de2f93 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpOkResultTest.cs @@ -45,7 +45,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs index 79ab2021e6..062b6098e4 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/HttpStatusCodeResultTests.cs @@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs index 422164aa9e..3589b0a281 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs @@ -435,7 +435,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/LocalRedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/LocalRedirectResultTest.cs index d2933bc972..8925f1a1a8 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/LocalRedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/LocalRedirectResultTest.cs @@ -102,7 +102,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceProvider GetServiceProvider(IUrlHelper urlHelper) { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(urlHelper); + serviceCollection.AddSingleton(urlHelper); serviceCollection.AddTransient(); return serviceCollection.BuildServiceProvider(); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ServicesModelBinderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ServicesModelBinderTest.cs index 732d6ba1c0..6f62bc758c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ServicesModelBinderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ModelBinding/ServicesModelBinderTest.cs @@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Mvc.ModelBinding var services = new ServiceCollection(); - services.AddInstance(new Service()); + services.AddSingleton(new Service()); var bindingContext = new ModelBindingContext { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs index d9fa58afec..f1c5edb3ba 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ObjectResultTests.cs @@ -65,12 +65,12 @@ namespace Microsoft.AspNet.Mvc private static IServiceProvider CreateServices() { var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( new TestOptionsManager(), new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), NullLoggerFactory.Instance)); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services.BuildServiceProvider(); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs index 26c35ab875..7322c1e5f6 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/PhysicalFileResultTest.cs @@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc // Assert Assert.NotNull(httpContext.Response.Body); var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync(); - Assert.Equal("FilePathResultTestFile contents¡", contents); + Assert.Equal("FilePathResultTestFile contents�", contents); } [Fact] @@ -120,7 +120,7 @@ namespace Microsoft.AspNet.Mvc // Assert Assert.NotNull(httpContext.Response.Body); var contents = await new StreamReader(httpContext.Response.Body).ReadToEndAsync(); - Assert.Equal("FilePathResultTestFile contents¡", contents); + Assert.Equal("FilePathResultTestFile contents�", contents); } [Theory] @@ -204,7 +204,7 @@ namespace Microsoft.AspNet.Mvc } else { - return new MemoryStream(Encoding.UTF8.GetBytes("FilePathResultTestFile contents¡")); + return new MemoryStream(Encoding.UTF8.GetBytes("FilePathResultTestFile contents�")); } } } @@ -212,7 +212,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs index 53b4802ecc..cf90dd4991 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectResultTest.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceProvider GetServiceProvider(IUrlHelper urlHelper) { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(urlHelper); + serviceCollection.AddSingleton(urlHelper); serviceCollection.AddTransient(); return serviceCollection.BuildServiceProvider(); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs index 54497278b8..140d2d2282 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToActionResultTest.cs @@ -93,7 +93,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs index 13466c0a05..e8f77f0c98 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/RedirectToRouteResultTest.cs @@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc private static IServiceCollection CreateServices() { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileResultTest.cs index e606e82699..df0e20d1ab 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/VirtualFileResultTest.cs @@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Mvc var httpContext = GetHttpContext(); httpContext.Response.Body = new MemoryStream(); httpContext.RequestServices = new ServiceCollection() - .AddInstance(appEnvironment.Object) + .AddSingleton(appEnvironment.Object) .AddTransient() .BuildServiceProvider(); var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor()); @@ -294,7 +294,7 @@ namespace Microsoft.AspNet.Mvc { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs index 6267de105a..1c8deca609 100644 --- a/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs @@ -144,7 +144,7 @@ namespace Microsoft.AspNet.Mvc.Cors } var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); httpContext.RequestServices = services.BuildServiceProvider(); var method = isPreflight ? CorsConstants.PreflightHttpMethod : "GET"; diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Infrastructure/JsonResultExecutorTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Infrastructure/JsonResultExecutorTest.cs index e64aa2d57e..fbd79009ce 100644 --- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Infrastructure/JsonResultExecutorTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/Infrastructure/JsonResultExecutorTest.cs @@ -173,7 +173,7 @@ namespace Microsoft.AspNet.Mvc.Infrastructure var services = new ServiceCollection(); services.AddOptions(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); httpContext.RequestServices = services.BuildServiceProvider(); return httpContext; diff --git a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs index ae5ee4ed9d..6fd9a47846 100644 --- a/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Formatters.Json.Test/JsonResultTest.cs @@ -49,7 +49,7 @@ namespace Microsoft.AspNet.Mvc new TestOptionsManager()); var services = new ServiceCollection(); - services.AddInstance(executor); + services.AddSingleton(executor); httpContext.RequestServices = services.BuildServiceProvider(); return httpContext; diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs index 9e0e42d8ae..aaa78699d4 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcTestFixture.cs @@ -106,17 +106,17 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests return (services) => { - services.AddInstance( + services.AddSingleton( new TestApplicationEnvironment(applicationEnvironment, applicationName, applicationRoot)); var hostingEnvironment = new HostingEnvironment(); hostingEnvironment.Initialize(applicationRoot, new WebHostOptions()); - services.AddInstance(hostingEnvironment); + services.AddSingleton(hostingEnvironment); // Inject a custom assembly provider. Overrides AddMvc() because that uses TryAdd(). var assemblyProvider = new StaticAssemblyProvider(); assemblyProvider.CandidateAssemblies.Add(startupAssembly); - services.AddInstance(assemblyProvider); + services.AddSingleton(assemblyProvider); AddAdditionalServices(services); diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs index da78fbbb24..660dd34e4f 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs @@ -233,10 +233,10 @@ namespace Microsoft.AspNet.Mvc private static void AddDnxServices(IServiceCollection serviceCollection) { - serviceCollection.AddInstance(Mock.Of()); - serviceCollection.AddInstance(Mock.Of()); - serviceCollection.AddInstance(Mock.Of()); - serviceCollection.AddInstance(Mock.Of()); + serviceCollection.AddSingleton(Mock.Of()); + serviceCollection.AddSingleton(Mock.Of()); + serviceCollection.AddSingleton(Mock.Of()); + serviceCollection.AddSingleton(Mock.Of()); var applicationEnvironment = new Mock(); // ApplicationBasePath is used to set up a PhysicalFileProvider which requires @@ -244,7 +244,7 @@ namespace Microsoft.AspNet.Mvc applicationEnvironment.SetupGet(e => e.ApplicationBasePath) .Returns(Directory.GetCurrentDirectory()); - serviceCollection.AddInstance(applicationEnvironment.Object); + serviceCollection.AddSingleton(applicationEnvironment.Object); } } } diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs index 163647bff7..a3c1fe5d96 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/PartialViewResultTest.cs @@ -119,7 +119,7 @@ namespace Microsoft.AspNet.Mvc NullLoggerFactory.Instance); var services = new ServiceCollection(); - services.AddInstance(viewExecutor); + services.AddSingleton(viewExecutor); var httpContext = new DefaultHttpContext(); httpContext.RequestServices = services.BuildServiceProvider(); diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs index 87caedff3e..401954e384 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs @@ -443,7 +443,7 @@ namespace Microsoft.AspNet.Mvc private static ClientModelValidationContext GetValidationContext(IUrlHelper urlHelper) { var serviceCollection = GetServiceCollection(); - serviceCollection.AddInstance(urlHelper); + serviceCollection.AddSingleton(urlHelper); var serviceProvider = serviceCollection.BuildServiceProvider(); return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); @@ -474,7 +474,7 @@ namespace Microsoft.AspNet.Mvc var contextAccessor = GetContextAccessor(serviceProvider, routeData); var actionSelector = new Mock(MockBehavior.Strict); var urlHelper = new UrlHelper(contextAccessor, actionSelector.Object); - serviceCollection.AddInstance(urlHelper); + serviceCollection.AddSingleton(urlHelper); serviceProvider = serviceCollection.BuildServiceProvider(); return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); @@ -496,7 +496,7 @@ namespace Microsoft.AspNet.Mvc var contextAccessor = GetContextAccessor(serviceProvider, routeData); var actionSelector = new Mock(MockBehavior.Strict); var urlHelper = new UrlHelper(contextAccessor, actionSelector.Object); - serviceCollection.AddInstance(urlHelper); + serviceCollection.AddSingleton(urlHelper); serviceProvider = serviceCollection.BuildServiceProvider(); return new ClientModelValidationContext(_metadata, _metadataProvider, serviceProvider); @@ -572,7 +572,7 @@ namespace Microsoft.AspNet.Mvc private static ServiceCollection GetServiceCollection() { var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(new NullLoggerFactory()); + serviceCollection.AddSingleton(new NullLoggerFactory()); var routeOptions = new RouteOptions(); var accessor = new Mock>(); @@ -580,9 +580,9 @@ namespace Microsoft.AspNet.Mvc .SetupGet(options => options.Value) .Returns(routeOptions); - serviceCollection.AddInstance>(accessor.Object); + serviceCollection.AddSingleton>(accessor.Object); - serviceCollection.AddInstance( + serviceCollection.AddSingleton( new DefaultInlineConstraintResolver(accessor.Object)); return serviceCollection; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs index 420a458029..6ee708a612 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs @@ -467,7 +467,7 @@ namespace Microsoft.AspNet.Mvc } var services = new ServiceCollection(); - services.AddInstance(diagnosticSource); + services.AddSingleton(diagnosticSource); services.AddSingleton, TestOptionsManager>(); services.AddTransient(); services.AddSingleton(); @@ -475,10 +475,10 @@ namespace Microsoft.AspNet.Mvc services.AddSingleton(); services.AddSingleton(); services.AddSingleton(); - services.AddInstance(new FixedSetViewComponentDescriptorProvider(descriptors)); + services.AddSingleton(new FixedSetViewComponentDescriptorProvider(descriptors)); services.AddSingleton(); - services.AddInstance(NullLoggerFactory.Instance); - services.AddInstance(new TempDataDictionary(httpContext, tempDataProvider)); + services.AddSingleton(NullLoggerFactory.Instance); + services.AddSingleton(new TempDataDictionary(httpContext, tempDataProvider)); services.AddTransient(); return services; diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs index f389daa559..88583845df 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewFeatures/ViewExecutorTest.cs @@ -128,9 +128,9 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures { var httpContext = new HttpContextAccessor() { HttpContext = new DefaultHttpContext() }; var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance(new EmptyModelMetadataProvider()); + serviceCollection.AddSingleton(new EmptyModelMetadataProvider()); var tempDataProvider = new SessionStateTempDataProvider(); - serviceCollection.AddInstance(new TempDataDictionary(httpContext, tempDataProvider)); + serviceCollection.AddSingleton(new TempDataDictionary(httpContext, tempDataProvider)); return serviceCollection.BuildServiceProvider(); } diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs index f023257827..9920621f05 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ViewResultTest.cs @@ -118,7 +118,7 @@ namespace Microsoft.AspNet.Mvc NullLoggerFactory.Instance); var services = new ServiceCollection(); - services.AddInstance(viewExecutor); + services.AddSingleton(viewExecutor); var httpContext = new DefaultHttpContext(); httpContext.RequestServices = services.BuildServiceProvider(); diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs index 69309a1358..4e2d1a079a 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/BadRequestErrorMessageResultTest.cs @@ -74,7 +74,7 @@ namespace System.Web.Http options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs index e9ff268cbf..0eeb5eede8 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ConflictResultTest.cs @@ -34,7 +34,7 @@ namespace System.Web.Http { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs index b9ddcfeb3a..1d56212580 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ExceptionResultTest.cs @@ -74,7 +74,7 @@ namespace System.Web.Http options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs index 222e6a22bd..f6ec139f78 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InternalServerErrorResultTest.cs @@ -34,7 +34,7 @@ namespace System.Web.Http { var services = new ServiceCollection(); - services.AddInstance(NullLoggerFactory.Instance); + services.AddSingleton(NullLoggerFactory.Instance); return services; } diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs index 4b3f45f30e..8cf9ef6e47 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/InvalidModelStateResultTest.cs @@ -87,7 +87,7 @@ namespace System.Web.Http options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs index 55eb359323..bfb7f59097 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/NegotiatedContentResultTest.cs @@ -74,7 +74,7 @@ namespace System.Web.Http options.Value.OutputFormatters.Add(new JsonOutputFormatter()); var services = new ServiceCollection(); - services.AddInstance(new ObjectResultExecutor( + services.AddSingleton(new ObjectResultExecutor( options, new ActionBindingContextAccessor(), new TestHttpResponseStreamWriterFactory(), diff --git a/test/WebSites/ActionResultsWebSite/Startup.cs b/test/WebSites/ActionResultsWebSite/Startup.cs index 3bf37f7cc6..c556bf0e1a 100644 --- a/test/WebSites/ActionResultsWebSite/Startup.cs +++ b/test/WebSites/ActionResultsWebSite/Startup.cs @@ -16,7 +16,7 @@ namespace ActionResultsWebSite .AddMvc() .AddXmlDataContractSerializerFormatters(); - services.AddInstance(new GuidLookupService()); + services.AddSingleton(new GuidLookupService()); } public void Configure(IApplicationBuilder app) diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs index a23c0fbb39..0f130d2979 100644 --- a/test/WebSites/ActivatorWebSite/Startup.cs +++ b/test/WebSites/ActivatorWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace ActivatorWebSite { // Add MVC services to the services container services.AddMvc(); - services.AddInstance(new MyService()); + services.AddSingleton(new MyService()); services.AddScoped(); }