diff --git a/samples/MvcSample.Web/Startup.cs b/samples/MvcSample.Web/Startup.cs index 21bc2a2d35..529cc9606f 100644 --- a/samples/MvcSample.Web/Startup.cs +++ b/samples/MvcSample.Web/Startup.cs @@ -31,7 +31,7 @@ namespace MvcSample.Web { app.UseMiddleware(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(); services.AddSingleton(); @@ -42,11 +42,11 @@ namespace MvcSample.Web // sample's assemblies are loaded. This prevents loading controllers from other assemblies // when the sample is used in the Functional Tests. services.AddTransient>(); - services.ConfigureOptions(options => + services.Configure(options => { options.Filters.Add(typeof(PassThroughAttribute), order: 17); }); - services.ConfigureOptions(options => + services.Configure(options => { var expander = new LanguageViewLocationExpander( context => context.HttpContext.Request.Query["language"]); @@ -72,7 +72,7 @@ namespace MvcSample.Web else #endif { - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(); services.AddSingleton(); @@ -83,7 +83,7 @@ namespace MvcSample.Web // when the sample is used in the Functional Tests. services.AddTransient>(); - services.ConfigureOptions(options => + services.Configure(options => { options.Filters.Add(typeof(PassThroughAttribute), order: 17); }); diff --git a/src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgery.cs b/src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgery.cs index eeced270d6..8c6fa13471 100644 --- a/src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgery.cs +++ b/src/Microsoft.AspNet.Mvc.Core/AntiForgery/AntiForgery.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc public AntiForgery([NotNull] IClaimUidExtractor claimUidExtractor, [NotNull] IDataProtectionProvider dataProtectionProvider, [NotNull] IAntiForgeryAdditionalDataProvider additionalDataProvider, - [NotNull] IOptionsAccessor mvcOptions) + [NotNull] IOptions mvcOptions) { var config = mvcOptions.Options.AntiForgeryOptions; var serializer = new AntiForgeryTokenSerializer(dataProtectionProvider.CreateProtector(_purpose)); diff --git a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs index 6b3c8fb610..1781b951b8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ControllerActionDescriptorProvider.cs @@ -29,7 +29,7 @@ namespace Microsoft.AspNet.Mvc public ControllerActionDescriptorProvider(IAssemblyProvider assemblyProvider, IActionDiscoveryConventions conventions, IGlobalFilterProvider globalFilters, - IOptionsAccessor optionsAccessor) + IOptions optionsAccessor) { _assemblyProvider = assemblyProvider; _conventions = conventions; diff --git a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultGlobalFilterProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultGlobalFilterProvider.cs index 0fce8c272f..8200c1c034 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultGlobalFilterProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Filters/DefaultGlobalFilterProvider.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Filters /// Creates a new instance of . /// /// The options accessor for . - public DefaultGlobalFilterProvider(IOptionsAccessor optionsAccessor) + public DefaultGlobalFilterProvider(IOptions optionsAccessor) { var filters = optionsAccessor.Options.Filters; _filters = filters.ToList(); diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultInputFormattersProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultInputFormattersProvider.cs index 4c1b0ef72b..92f2ba2b0d 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultInputFormattersProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultInputFormattersProvider.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors /// An instance used to instantiate types. /// A instance that retrieves services from the /// service collection. - public DefaultInputFormattersProvider(IOptionsAccessor optionsAccessor, + public DefaultInputFormattersProvider(IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.InputFormatters, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs index a14712fee2..c29d978849 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc /// An instance used to instantiate types. /// A instance that retrieves services from the /// service collection. - public DefaultOutputFormattersProvider(IOptionsAccessor optionsAccessor, + public DefaultOutputFormattersProvider(IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.OutputFormatters, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs index 2b52852bc0..aee7841999 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Internal/MvcServicesHelper.cs @@ -24,7 +24,7 @@ namespace Microsoft.AspNet.Mvc.Internal { throw new InvalidOperationException(Resources.FormatUnableToFindServices( "IServiceCollection.AddMvc()", - "IApplicationBuilder.UsePerRequestServices(...)", + "IApplicationBuilder.UseServices(...)", "IApplicationBuilder.UseMvc(...)")); } } diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs b/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs index 47a2dca02d..d3e477c427 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs +++ b/src/Microsoft.AspNet.Mvc.Core/MvcRouteHandler.cs @@ -78,7 +78,7 @@ namespace Microsoft.AspNet.Mvc var actionContext = new ActionContext(context.HttpContext, context.RouteData, actionDescriptor); - var optionsAccessor = services.GetService>(); + var optionsAccessor = services.GetService>(); actionContext.ModelState.MaxAllowedErrors = optionsAccessor.Options.MaxModelValidationErrors; var contextAccessor = services.GetService>(); diff --git a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelBinderProvider.cs b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelBinderProvider.cs index 86ca59e69e..8a66b826ab 100644 --- a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelBinderProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelBinderProvider.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors /// A instance that retrieves services from the /// service collection. public DefaultModelBindersProvider( - IOptionsAccessor optionsAccessor, + IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.ModelBinders, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelValidatorProviderProvider.cs b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelValidatorProviderProvider.cs index 466333395f..3c74d7f295 100644 --- a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelValidatorProviderProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultModelValidatorProviderProvider.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors /// A instance that retrieves services from the /// service collection. public DefaultModelValidatorProviderProvider( - IOptionsAccessor optionsAccessor, + IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.ModelValidatorProviders, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultValueProviderFactoryProvider.cs b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultValueProviderFactoryProvider.cs index a9c9efab10..55023402bb 100644 --- a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultValueProviderFactoryProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultValueProviderFactoryProvider.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors /// A instance that retrieves services from the /// service collection. public DefaultValueProviderFactoryProvider( - IOptionsAccessor optionsAccessor, + IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.ValueProviderFactories, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultViewEngineProvider.cs b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultViewEngineProvider.cs index 87ad8c1bed..593ca579cb 100644 --- a/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultViewEngineProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/OptionDescriptors/DefaultViewEngineProvider.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors /// A instance that retrieves services from the /// service collection. public DefaultViewEngineProvider( - IOptionsAccessor optionsAccessor, + IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.ViewEngines, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ExpiringFileInfoCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ExpiringFileInfoCache.cs index 68af815d4d..8f4401dbe3 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ExpiringFileInfoCache.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ExpiringFileInfoCache.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc.Razor private readonly IFileSystem _fileSystem; private readonly TimeSpan _offset; - public ExpiringFileInfoCache(IOptionsAccessor optionsAccessor) + public ExpiringFileInfoCache(IOptions optionsAccessor) { _fileSystem = optionsAccessor.Options.FileSystem; _offset = optionsAccessor.Options.ExpirationBeforeCheckingFilesOnDisk; diff --git a/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/DefaultViewLocationExpanderProvider.cs b/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/DefaultViewLocationExpanderProvider.cs index 98b1c5c2cb..da9e06f820 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/DefaultViewLocationExpanderProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/OptionDescriptors/DefaultViewLocationExpanderProvider.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Mvc.Razor.OptionDescriptors /// A instance that retrieves services from the /// service collection. public DefaultViewLocationExpanderProvider( - IOptionsAccessor optionsAccessor, + IOptions optionsAccessor, ITypeActivator typeActivator, IServiceProvider serviceProvider) : base(optionsAccessor.Options.ViewLocationExpanders, typeActivator, serviceProvider) diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs b/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs index 22670fca49..108beeeb7c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs @@ -22,13 +22,13 @@ namespace Microsoft.AspNet.Mvc.Razor public RazorPreCompiler([NotNull] IServiceProvider designTimeServiceProvider) : this(designTimeServiceProvider, designTimeServiceProvider.GetService(), - designTimeServiceProvider.GetService>()) + designTimeServiceProvider.GetService>()) { } public RazorPreCompiler([NotNull] IServiceProvider designTimeServiceProvider, [NotNull] IMvcRazorHost host, - [NotNull] IOptionsAccessor optionsAccessor) + [NotNull] IOptions optionsAccessor) { _serviceProvider = designTimeServiceProvider; _host = host; diff --git a/src/Microsoft.AspNet.Mvc.Razor/ViewStartProvider.cs b/src/Microsoft.AspNet.Mvc.Razor/ViewStartProvider.cs index 8116ca486b..3020074580 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/ViewStartProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/ViewStartProvider.cs @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.Razor private readonly IRazorPageFactory _pageFactory; public ViewStartProvider(IRazorPageFactory pageFactory, - IOptionsAccessor optionsAccessor) + IOptions optionsAccessor) { _fileSystem = optionsAccessor.Options.FileSystem; _pageFactory = pageFactory; diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs index a2555f9c75..b4bd72ff6c 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs @@ -214,7 +214,7 @@ namespace System.Net.Http if (formatters == null) { // Get the default formatters from options - var options = context.RequestServices.GetService>(); + var options = context.RequestServices.GetService>(); formatters = options.Options.Formatters; } @@ -266,7 +266,7 @@ namespace System.Net.Http var context = GetHttpContext(request); // Get the default formatters from options - var options = context.RequestServices.GetService>(); + var options = context.RequestServices.GetService>(); var formatters = options.Options.Formatters; var formatter = formatters.FindWriter(typeof(T), mediaType); diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs index 6d3f576bb5..8f5a061336 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs @@ -6,7 +6,7 @@ using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Mvc.WebApiCompatShim { - public class WebApiCompatShimOptionsSetup : IOptionsAction, IOptionsAction + public class WebApiCompatShimOptionsSetup : IConfigureOptions, IConfigureOptions { public readonly static string DefaultAreaName = "api"; @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim public string Name { get; set; } - public void Invoke(MvcOptions options) + public void Configure(MvcOptions options, string name = "") { // Add webapi behaviors to controllers with the appropriate attributes options.ApplicationModelConventions.Add(new WebApiActionConventionsGlobalModelConvention()); @@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim options.OutputFormatters.Insert(0, new HttpResponseMessageOutputFormatter()); } - public void Invoke(WebApiCompatShimOptions options) + public void Configure(WebApiCompatShimOptions options, string name = "") { // Add the default formatters options.Formatters.AddRange(new MediaTypeFormatterCollection()); diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs index c821107215..ea098a4377 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimServiceCollectionExtensions.cs @@ -10,7 +10,7 @@ namespace Microsoft.Framework.DependencyInjection { public static IServiceCollection AddWebApiConventions(this IServiceCollection services) { - services.AddOptionsAction(); + services.ConfigureOptions(); // The constructors on DefaultContentNegotiator aren't DI friendly, so just // new it up. diff --git a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs index 9c449a294b..53ff1123e0 100644 --- a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc /// /// Sets up default options for . /// - public class MvcOptionsSetup : OptionsAction + public class MvcOptionsSetup : ConfigureOptions { /// Sets the Order to -1 to allow MvcOptionsSetup to run before a user call to ConfigureOptions. public MvcOptionsSetup() : base(ConfigureMvc) diff --git a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs index 0d890f26cf..e7bd01c814 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs @@ -26,7 +26,7 @@ namespace Microsoft.Framework.DependencyInjection private static void AddMvcRouteOptions(IServiceCollection services) { - services.ConfigureOptions(routeOptions => + services.Configure(routeOptions => routeOptions.ConstraintMap .Add("exists", typeof(KnownRouteValueConstraint))); diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs index e1c66d5218..2c531b79de 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServices.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs @@ -34,9 +34,8 @@ namespace Microsoft.AspNet.Mvc // // Options and core services. // - yield return describe.Transient, MvcOptionsSetup>(); - yield return describe.Transient, RazorViewEngineOptionsSetup>(); - + yield return describe.Transient, MvcOptionsSetup>(); + yield return describe.Transient, RazorViewEngineOptionsSetup>(); yield return describe.Transient(); yield return describe.Transient(typeof(INestedProviderManager<>), typeof(NestedProviderManager<>)); yield return describe.Transient(typeof(INestedProviderManagerAsync<>), typeof(NestedProviderManagerAsync<>)); @@ -110,7 +109,7 @@ namespace Microsoft.AspNet.Mvc // The host is designed to be discarded after consumption and is very inexpensive to initialize. yield return describe.Transient(serviceProvider => { - var optionsAccessor = serviceProvider.GetService>(); + var optionsAccessor = serviceProvider.GetService>(); return new MvcRazorHost(optionsAccessor.Options.FileSystem); }); diff --git a/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs index 2f1beb64a2..3ee6068e7c 100644 --- a/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Mvc/Properties/Resources.Designer.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNet.Mvc = new ResourceManager("Microsoft.AspNet.Mvc.Resources", typeof(Resources).GetTypeInfo().Assembly); /// - /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UsePerRequestServices() in the Application Startup. + /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UseServices() in the Application Startup. /// internal static string UnableToFindServices { @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc } /// - /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UsePerRequestServices() in the Application Startup. + /// Unable to find the required services. Please add all the required services by calling AddMvc() before calling UseMvc()/UseServices() in the Application Startup. /// internal static string FormatUnableToFindServices() { diff --git a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs index 0f72b07400..ce291482ac 100644 --- a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs +++ b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs @@ -30,8 +30,8 @@ namespace Microsoft.AspNet.Mvc var appEnv = _appServices.GetService(); var setup = new RazorViewEngineOptionsSetup(appEnv); - var accessor = new OptionsAccessor(new[] { setup }); - sc.AddInstance>(accessor); + var accessor = new OptionsManager(new[] { setup }); + sc.AddInstance>(accessor); sc.Add(MvcServices.GetDefaultServices()); var sp = sc.BuildServiceProvider(_appServices); diff --git a/src/Microsoft.AspNet.Mvc/RazorViewEngineOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/RazorViewEngineOptionsSetup.cs index d93e10d43c..281d458406 100644 --- a/src/Microsoft.AspNet.Mvc/RazorViewEngineOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc/RazorViewEngineOptionsSetup.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNet.Mvc /// /// Sets up default options for . /// - public class RazorViewEngineOptionsSetup : OptionsAction + public class RazorViewEngineOptionsSetup : ConfigureOptions { /// /// Initializes a new instance of . diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs index 6b5b5843da..dd5c1863e7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs @@ -521,12 +521,12 @@ namespace Microsoft.AspNet.Mvc.Core.Test.ActionResults { var optionsSetup = new MvcOptionsSetup(); var options = new MvcOptions(); - optionsSetup.Invoke(options); - var optionsAccessor = new Mock>(); + optionsSetup.Configure(options); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(options); var serviceCollection = new ServiceCollection(); - serviceCollection.AddInstance>(optionsAccessor.Object); + serviceCollection.AddInstance>(optionsAccessor.Object); return serviceCollection.BuildServiceProvider(); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/ValidateAntiForgeryTokenAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/ValidateAntiForgeryTokenAttributeTest.cs index 5707585348..808acd39ee 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/ValidateAntiForgeryTokenAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/AntiXsrf/ValidateAntiForgeryTokenAttributeTest.cs @@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test var claimExtractor = new Mock(); var dataProtectionProvider = new Mock(); var additionalDataProvider = new Mock(); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(new MvcOptions()); return new AntiForgery(claimExtractor.Object, dataProtectionProvider.Object, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs index 9ceb03e447..20f048aaf2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionDescriptorProviderTests.cs @@ -1369,7 +1369,7 @@ namespace Microsoft.AspNet.Mvc.Test private ControllerActionDescriptorProvider GetProvider( TypeInfo type, - IOptionsAccessor options) + IOptions options) { var conventions = new StaticActionDiscoveryConventions(type); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/InputObjectBindingTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/InputObjectBindingTests.cs index c5f7d410e8..af28b7b8bf 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/InputObjectBindingTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/InputObjectBindingTests.cs @@ -131,8 +131,8 @@ namespace Microsoft.AspNet.Mvc var mvcOptions = new MvcOptions(); var setup = new MvcOptionsSetup(); - setup.Invoke(mvcOptions); - var accessor = new Mock>(); + setup.Configure(mvcOptions); + var accessor = new Mock>(); accessor.SetupGet(a => a.Options) .Returns(mvcOptions); var validatorProvider = new DefaultModelValidatorProviderProvider( diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs index 07673d5692..551c74027b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Internal/MvcServicesHelperTests.cs @@ -19,7 +19,7 @@ namespace Microsoft.AspNet.Mvc services.Setup(o => o.GetService(typeof(IEnumerable))) .Returns(new List()); var expectedMessage = "Unable to find the required services. Please add all the required " + - "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UsePerRequestServices(...)' " + + "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " + "or 'IApplicationBuilder.UseMvc(...)' in the application startup code."; // Act & Assert diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs index f3e07d9ab4..050df56ea3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs @@ -5,7 +5,7 @@ using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Mvc { - public class MockMvcOptionsAccessor : IOptionsAccessor + public class MockMvcOptionsAccessor : IOptions { public MockMvcOptionsAccessor() { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs index a814ae0ae3..a521c03d42 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/MvcRouteHandlerTests.cs @@ -132,7 +132,7 @@ namespace Microsoft.AspNet.Mvc { // Arrange var expected = 199; - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); var options = new MvcOptions { MaxModelValidationErrors = expected @@ -167,7 +167,7 @@ namespace Microsoft.AspNet.Mvc IActionSelector actionSelector = null, IActionInvokerFactory invokerFactory = null, ILoggerFactory loggerFactory = null, - IOptionsAccessor optionsAccessor = null) + IOptions optionsAccessor = null) { var mockContextAccessor = new Mock>(); mockContextAccessor.Setup(c => c.SetContextSource( @@ -207,7 +207,7 @@ namespace Microsoft.AspNet.Mvc if (optionsAccessor == null) { - var mockOptionsAccessor = new Mock>(); + var mockOptionsAccessor = new Mock>(); mockOptionsAccessor.SetupGet(o => o.Options) .Returns(new MvcOptions()); @@ -225,7 +225,7 @@ namespace Microsoft.AspNet.Mvc .Returns(loggerFactory); httpContext.Setup(h => h.RequestServices.GetService(typeof(IEnumerable))) .Returns(new List { new MvcMarkerService() }); - httpContext.Setup(h => h.RequestServices.GetService(typeof(IOptionsAccessor))) + httpContext.Setup(h => h.RequestServices.GetService(typeof(IOptions))) .Returns(optionsAccessor); return new RouteContext(httpContext.Object); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultModelBindersProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultModelBindersProviderTest.cs index 2aa8d38e5e..7b3dc21edf 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultModelBindersProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultModelBindersProviderTest.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors var options = new MvcOptions(); options.ModelBinders.Add(binder); options.ModelBinders.Add(typeof(TestModelBinder)); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options) .Returns(options); var activator = new TypeActivator(); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValidationProviderProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValidationProviderProviderTest.cs index 5b291a19a4..52d8b702b7 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValidationProviderProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValidationProviderProviderTest.cs @@ -27,7 +27,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors var options = new MvcOptions(); options.ModelValidatorProviders.Add(type); options.ModelValidatorProviders.Add(validationProvider); - var accessor = new Mock>(); + var accessor = new Mock>(); accessor.SetupGet(a => a.Options) .Returns(options); var provider = new DefaultModelValidatorProviderProvider(accessor.Object, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValueProviderFactoryProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValueProviderFactoryProviderTest.cs index 82d0913c4a..eb24f18b62 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValueProviderFactoryProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultValueProviderFactoryProviderTest.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors var options = new MvcOptions(); options.ValueProviderFactories.Add(valueProviderFactory); options.ValueProviderFactories.Add(type); - var accessor = new Mock>(); + var accessor = new Mock>(); accessor.SetupGet(a => a.Options) .Returns(options); var provider = new DefaultValueProviderFactoryProvider(accessor.Object, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultViewEngineProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultViewEngineProviderTest.cs index 88356fe7d9..43df2a8e2c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultViewEngineProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/OptionDescriptors/DefaultViewEngineProviderTest.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.OptionDescriptors var options = new MvcOptions(); options.ViewEngines.Add(viewEngine); options.ViewEngines.Add(type); - var accessor = new Mock>(); + var accessor = new Mock>(); accessor.SetupGet(a => a.Options) .Returns(options); var provider = new DefaultViewEngineProvider(accessor.Object, typeActivator, serviceProvider.Object); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs index ec64aeb464..5a7ad1318b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Rendering/DefaultTemplatesUtilities.cs @@ -172,7 +172,7 @@ namespace Microsoft.AspNet.Mvc.Rendering var claimExtractor = new Mock(); var dataProtectionProvider = new Mock(); var additionalDataProvider = new Mock(); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(new MvcOptions()); return new AntiForgery(claimExtractor.Object, dataProtectionProvider.Object, diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs index b87c491d1e..8f8df78634 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs @@ -60,7 +60,7 @@ namespace Microsoft.AspNet.Mvc.Routing private static decimal Compute(string template) { - var options = new Mock>(); + var options = new Mock>(); options.SetupGet(o => o.Options).Returns(new RouteOptions()); var constraintResolver = new DefaultInlineConstraintResolver( diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs index d637a71e3a..ea4f024c44 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRouteTests.cs @@ -1211,7 +1211,7 @@ namespace Microsoft.AspNet.Mvc.Routing var services = Mock.Of(); var options = new RouteOptions(); - var optionsMock = new Mock>(); + var optionsMock = new Mock>(); optionsMock.SetupGet(o => o.Options).Returns(options); return new DefaultInlineConstraintResolver(services, optionsMock.Object); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs index 7075c69284..7416473691 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs @@ -161,7 +161,7 @@ namespace Microsoft.AspNet.Mvc.Routing .Setup(s => s.GetService(typeof(IActionDescriptorsCollectionProvider))) .Returns(actionDescriptorProvider.Object); - var routeOptions = new Mock>(); + var routeOptions = new Mock>(); routeOptions .SetupGet(o => o.Options) .Returns(new RouteOptions()); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs index 0ae9023986..a2baf9ca62 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs @@ -641,7 +641,7 @@ namespace Microsoft.AspNet.Mvc.Core.Test .Returns(rc => null); rt.DefaultHandler = target.Object; var serviceProviderMock = new Mock(); - var accessorMock = new Mock>(); + var accessorMock = new Mock>(); accessorMock.SetupGet(o => o.Options).Returns(new RouteOptions()); serviceProviderMock.Setup(o => o.GetService(typeof(IInlineConstraintResolver))) .Returns(new DefaultInlineConstraintResolver(serviceProviderMock.Object, diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs index b701a69a26..deb39e1839 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/MvcStartupTests.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { // Arrange var expectedMessage = "Unable to find the required services. Please add all the required " + - "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UsePerRequestServices(...)' " + + "services by calling 'IServiceCollection.AddMvc()' inside the call to 'IApplicationBuilder.UseServices(...)' " + "or 'IApplicationBuilder.UseMvc(...)' in the application startup code."; // Act & Assert diff --git a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs index 93448dd0d6..d948c2f3d7 100644 --- a/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs +++ b/test/Microsoft.AspNet.Mvc.ModelBinding.Test/Validation/DefaultBodyModelValidatorTests.cs @@ -9,6 +9,7 @@ using System.Linq; using Microsoft.AspNet.Testing; using Moq; using Xunit; +using Microsoft.Framework.OptionsModel; namespace Microsoft.AspNet.Mvc.ModelBinding { diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpiringFileInfoCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpiringFileInfoCacheTest.cs index 7414bf09e7..b5c8ad1948 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpiringFileInfoCacheTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/ExpiringFileInfoCacheTest.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc.Razor public DummyFileSystem TestFileSystem { get; } = new DummyFileSystem(); - public IOptionsAccessor OptionsAccessor + public IOptions OptionsAccessor { get { @@ -26,14 +26,14 @@ namespace Microsoft.AspNet.Mvc.Razor FileSystem = TestFileSystem }; - var mock = new Mock>(MockBehavior.Strict); + var mock = new Mock>(MockBehavior.Strict); mock.Setup(oa => oa.Options).Returns(options); return mock.Object; } } - public ControllableExpiringFileInfoCache GetCache(IOptionsAccessor optionsAccessor) + public ControllableExpiringFileInfoCache GetCache(IOptions optionsAccessor) { return new ControllableExpiringFileInfoCache(optionsAccessor); } @@ -54,14 +54,14 @@ namespace Microsoft.AspNet.Mvc.Razor cache.Sleep(offsetMilliseconds); } - public void Sleep(IOptionsAccessor accessor, ControllableExpiringFileInfoCache cache, int offsetMilliSeconds) + public void Sleep(IOptions accessor, ControllableExpiringFileInfoCache cache, int offsetMilliSeconds) { var baseMilliSeconds = (int)accessor.Options.ExpirationBeforeCheckingFilesOnDisk.TotalMilliseconds; cache.Sleep(baseMilliSeconds + offsetMilliSeconds); } - public void SetExpiration(IOptionsAccessor accessor, TimeSpan expiration) + public void SetExpiration(IOptions accessor, TimeSpan expiration) { accessor.Options.ExpirationBeforeCheckingFilesOnDisk = expiration; } @@ -307,7 +307,7 @@ namespace Microsoft.AspNet.Mvc.Razor public class ControllableExpiringFileInfoCache : ExpiringFileInfoCache { - public ControllableExpiringFileInfoCache(IOptionsAccessor optionsAccessor) + public ControllableExpiringFileInfoCache(IOptions optionsAccessor) : base(optionsAccessor) { } diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/OptionDescriptors/DefaultViewLocationExpanderProviderTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/OptionDescriptors/DefaultViewLocationExpanderProviderTest.cs index a73ab403b4..6ed5fec52e 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/OptionDescriptors/DefaultViewLocationExpanderProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/OptionDescriptors/DefaultViewLocationExpanderProviderTest.cs @@ -26,7 +26,7 @@ namespace Microsoft.AspNet.Mvc.Razor.OptionDescriptors var options = new RazorViewEngineOptions(); options.ViewLocationExpanders.Add(type); options.ViewLocationExpanders.Add(expander); - var accessor = new Mock>(); + var accessor = new Mock>(); accessor.SetupGet(a => a.Options) .Returns(options); var provider = new DefaultViewLocationExpanderProvider(accessor.Object, diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs index 5ce47d0865..fdc6d4d688 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionSetupTest.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert Assert.Equal(1, mvcOptions.ViewEngines.Count); @@ -32,7 +32,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert Assert.Equal(7, mvcOptions.ModelBinders.Count); @@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert var valueProviders = mvcOptions.ValueProviderFactories; @@ -71,7 +71,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert Assert.Equal(4, mvcOptions.OutputFormatters.Count); @@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert Assert.Equal(2, mvcOptions.InputFormatters.Count); @@ -105,7 +105,7 @@ namespace Microsoft.AspNet.Mvc var setup = new MvcOptionsSetup(); // Act - setup.Invoke(mvcOptions); + setup.Configure(mvcOptions); // Assert Assert.Equal(2, mvcOptions.ModelValidatorProviders.Count); diff --git a/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs index 2226461a36..eba5d78c7f 100644 --- a/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/RazorViewEngineOptionsSetupTest.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNet.Mvc var optionsSetup = new RazorViewEngineOptionsSetup(appEnv.Object); // Act - optionsSetup.Invoke(options); + optionsSetup.Configure(options); // Assert Assert.NotNull(options.FileSystem); diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs index cf43ba53a2..3d96a3b3d3 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs @@ -267,9 +267,9 @@ namespace System.Web.Http var options = new MvcOptions(); var setup = new WebApiCompatShimOptionsSetup(); - setup.Invoke(options); + setup.Configure(options); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor .SetupGet(o => o.Options) .Returns(options); diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs index 6996b3245a..0e4d71c009 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs @@ -30,11 +30,11 @@ namespace System.Net.Http var options = new WebApiCompatShimOptions(); options.Formatters.AddRange(new MediaTypeFormatterCollection()); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(options); services - .Setup(s => s.GetService(typeof(IOptionsAccessor))) + .Setup(s => s.GetService(typeof(IOptions))) .Returns(optionsAccessor.Object); context.RequestServices = services.Object; @@ -63,11 +63,11 @@ namespace System.Net.Http var options = new WebApiCompatShimOptions(); options.Formatters.AddRange(new MediaTypeFormatterCollection()); - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(options); services - .Setup(s => s.GetService(typeof(IOptionsAccessor))) + .Setup(s => s.GetService(typeof(IOptions))) .Returns(optionsAccessor.Object); context.RequestServices = services.Object; @@ -326,12 +326,12 @@ namespace System.Net.Http options.Formatters.Add(formatter); } - var optionsAccessor = new Mock>(); + var optionsAccessor = new Mock>(); optionsAccessor.SetupGet(o => o.Options).Returns(options); var services = new Mock(MockBehavior.Strict); services - .Setup(s => s.GetService(typeof(IOptionsAccessor))) + .Setup(s => s.GetService(typeof(IOptions))) .Returns(optionsAccessor.Object); if (contentNegotiator != null) diff --git a/test/WebSites/ActivatorWebSite/Startup.cs b/test/WebSites/ActivatorWebSite/Startup.cs index f5061deec1..dfc3a68168 100644 --- a/test/WebSites/ActivatorWebSite/Startup.cs +++ b/test/WebSites/ActivatorWebSite/Startup.cs @@ -14,7 +14,7 @@ namespace ActivatorWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/AntiForgeryWebSite/Startup.cs b/test/WebSites/AntiForgeryWebSite/Startup.cs index c31be230ad..9c0e4f3404 100644 --- a/test/WebSites/AntiForgeryWebSite/Startup.cs +++ b/test/WebSites/AntiForgeryWebSite/Startup.cs @@ -9,7 +9,7 @@ namespace AntiForgeryWebSite public void Configure(IApplicationBuilder app) { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); }); diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs index 8152380607..8a3bf87ef0 100644 --- a/test/WebSites/ApiExplorerWebSite/Startup.cs +++ b/test/WebSites/ApiExplorerWebSite/Startup.cs @@ -14,12 +14,12 @@ namespace ApiExplorer { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); services.AddSingleton(); - services.ConfigureOptions(options => + services.Configure(options => { options.Filters.AddService(typeof(ApiExplorerDataFilter)); diff --git a/test/WebSites/ApplicationModelWebSite/Startup.cs b/test/WebSites/ApplicationModelWebSite/Startup.cs index 449aa49af2..b736e8dc42 100644 --- a/test/WebSites/ApplicationModelWebSite/Startup.cs +++ b/test/WebSites/ApplicationModelWebSite/Startup.cs @@ -12,7 +12,7 @@ namespace ApplicationModelWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); }); diff --git a/test/WebSites/AutofacWebSite/Startup.cs b/test/WebSites/AutofacWebSite/Startup.cs index fcac5d1c72..77fb4b31e4 100644 --- a/test/WebSites/AutofacWebSite/Startup.cs +++ b/test/WebSites/AutofacWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace AutofacWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => { + app.UseServices(services => { services.AddMvc(configuration); services.AddTransient(); diff --git a/test/WebSites/BasicWebSite/Startup.cs b/test/WebSites/BasicWebSite/Startup.cs index 9d1e6e53c7..955d4378ec 100644 --- a/test/WebSites/BasicWebSite/Startup.cs +++ b/test/WebSites/BasicWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace BasicWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/CompositeViewEngine/Startup.cs b/test/WebSites/CompositeViewEngine/Startup.cs index a0e7c5f003..389a6b3082 100644 --- a/test/WebSites/CompositeViewEngine/Startup.cs +++ b/test/WebSites/CompositeViewEngine/Startup.cs @@ -14,11 +14,11 @@ namespace CompositeViewEngine var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add a view engine as the first one in the list. services.AddMvc(configuration) - .ConfigureOptions(options => + .Configure(options => { options.ViewEngines.Insert(0, typeof(TestViewEngine)); }); diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ConnegWebSite/Startup.cs index 5e862b944c..939707b984 100644 --- a/test/WebSites/ConnegWebSite/Startup.cs +++ b/test/WebSites/ConnegWebSite/Startup.cs @@ -14,7 +14,7 @@ namespace ConnegWebsite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/FilesWebSite/Startup.cs b/test/WebSites/FilesWebSite/Startup.cs index d993f70798..59c706ca1a 100644 --- a/test/WebSites/FilesWebSite/Startup.cs +++ b/test/WebSites/FilesWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace FilesWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); }); diff --git a/test/WebSites/FiltersWebSite/Startup.cs b/test/WebSites/FiltersWebSite/Startup.cs index 80bc336def..29cf03c2ad 100644 --- a/test/WebSites/FiltersWebSite/Startup.cs +++ b/test/WebSites/FiltersWebSite/Startup.cs @@ -15,11 +15,11 @@ namespace FiltersWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); - services.ConfigureOptions(options => + services.Configure(options => { options.Filters.Add(new GlobalExceptionFilter()); }); diff --git a/test/WebSites/FormatterWebSite/Startup.cs b/test/WebSites/FormatterWebSite/Startup.cs index 4c6e99601c..502301c7fb 100644 --- a/test/WebSites/FormatterWebSite/Startup.cs +++ b/test/WebSites/FormatterWebSite/Startup.cs @@ -14,7 +14,7 @@ namespace FormatterWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/InlineConstraintsWebSite/Startup.cs b/test/WebSites/InlineConstraintsWebSite/Startup.cs index c7acf97a1c..d1d8b181b1 100644 --- a/test/WebSites/InlineConstraintsWebSite/Startup.cs +++ b/test/WebSites/InlineConstraintsWebSite/Startup.cs @@ -38,7 +38,7 @@ namespace InlineConstraints } // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/ModelBindingWebSite/Startup.cs b/test/WebSites/ModelBindingWebSite/Startup.cs index fa4a212f93..79f61f9889 100644 --- a/test/WebSites/ModelBindingWebSite/Startup.cs +++ b/test/WebSites/ModelBindingWebSite/Startup.cs @@ -15,11 +15,11 @@ namespace ModelBindingWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration) - .ConfigureOptions(m => + .Configure(m => { m.MaxModelValidationErrors = 8; }); diff --git a/test/WebSites/RazorInstrumentationWebsite/Startup.cs b/test/WebSites/RazorInstrumentationWebsite/Startup.cs index a55cd4152e..4f8987bd3a 100644 --- a/test/WebSites/RazorInstrumentationWebsite/Startup.cs +++ b/test/WebSites/RazorInstrumentationWebsite/Startup.cs @@ -17,7 +17,7 @@ namespace RazorInstrumentationWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); diff --git a/test/WebSites/RazorWebSite/Startup.cs b/test/WebSites/RazorWebSite/Startup.cs index 61b8ae8285..51cbc1681c 100644 --- a/test/WebSites/RazorWebSite/Startup.cs +++ b/test/WebSites/RazorWebSite/Startup.cs @@ -12,12 +12,12 @@ namespace RazorWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); services.AddTransient(); - services.ConfigureOptions(options => + services.Configure(options => { var expander = new LanguageViewLocationExpander( context => context.HttpContext.Request.Query["language-expander-value"]); diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/test/WebSites/RoutingWebSite/Startup.cs index f581ee78db..c353939d84 100644 --- a/test/WebSites/RoutingWebSite/Startup.cs +++ b/test/WebSites/RoutingWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace RoutingWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); diff --git a/test/WebSites/TagHelpersWebSite/Startup.cs b/test/WebSites/TagHelpersWebSite/Startup.cs index 19669aa022..6a967400cf 100644 --- a/test/WebSites/TagHelpersWebSite/Startup.cs +++ b/test/WebSites/TagHelpersWebSite/Startup.cs @@ -12,7 +12,7 @@ namespace TagHelpersWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); }); diff --git a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs index 9231b94fa4..c0155e201b 100644 --- a/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs +++ b/test/WebSites/UrlHelperWebSite/CustomUrlHelper.cs @@ -14,11 +14,11 @@ namespace UrlHelperWebSite /// public class CustomUrlHelper : UrlHelper { - private readonly IOptionsAccessor _appOptions; + private readonly IOptions _appOptions; private readonly HttpContext _httpContext; public CustomUrlHelper(IContextAccessor contextAccessor, IActionSelector actionSelector, - IOptionsAccessor appOptions) + IOptions appOptions) : base(contextAccessor, actionSelector) { _appOptions = appOptions; diff --git a/test/WebSites/UrlHelperWebSite/Startup.cs b/test/WebSites/UrlHelperWebSite/Startup.cs index 74843c00de..bc55f639dc 100644 --- a/test/WebSites/UrlHelperWebSite/Startup.cs +++ b/test/WebSites/UrlHelperWebSite/Startup.cs @@ -14,9 +14,9 @@ namespace UrlHelperWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { - services.ConfigureOptions(optionsSetup => + services.Configure(optionsSetup => { optionsSetup.ServeCDNContent = true; optionsSetup.CDNServerBaseUrl = "http://cdn.contoso.com"; diff --git a/test/WebSites/ValueProvidersSite/Startup.cs b/test/WebSites/ValueProvidersSite/Startup.cs index 51ead99313..1d028525e5 100644 --- a/test/WebSites/ValueProvidersSite/Startup.cs +++ b/test/WebSites/ValueProvidersSite/Startup.cs @@ -14,11 +14,11 @@ namespace ValueProvidersSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration) - .ConfigureOptions(options => + .Configure(options => { options.ValueProviderFactories.Insert(1, new CustomValueProviderFactory()); }); diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/test/WebSites/VersioningWebSite/Startup.cs index 4abbf72342..a19a7ee669 100644 --- a/test/WebSites/VersioningWebSite/Startup.cs +++ b/test/WebSites/VersioningWebSite/Startup.cs @@ -12,7 +12,7 @@ namespace VersioningWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs index 36cda533c4..bec947119e 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs @@ -16,7 +16,7 @@ namespace WebApiCompatShimWebSite public class BasicApiController : ApiController { [Activate] - public IOptionsAccessor OptionsAccessor { get; set; } + public IOptions OptionsAccessor { get; set; } // Verifies property activation [HttpGet] diff --git a/test/WebSites/WebApiCompatShimWebSite/Startup.cs b/test/WebSites/WebApiCompatShimWebSite/Startup.cs index 2bc4fd8915..180c028745 100644 --- a/test/WebSites/WebApiCompatShimWebSite/Startup.cs +++ b/test/WebSites/WebApiCompatShimWebSite/Startup.cs @@ -13,7 +13,7 @@ namespace WebApiCompatShimWebSite { var configuration = app.GetTestConfiguration(); - app.UsePerRequestServices(services => + app.UseServices(services => { services.AddMvc(configuration); diff --git a/test/WebSites/XmlSerializerWebSite/Startup.cs b/test/WebSites/XmlSerializerWebSite/Startup.cs index 3df5f16ad1..6a044444d4 100644 --- a/test/WebSites/XmlSerializerWebSite/Startup.cs +++ b/test/WebSites/XmlSerializerWebSite/Startup.cs @@ -15,12 +15,12 @@ namespace XmlSerializerWebSite var configuration = app.GetTestConfiguration(); // Set up application services - app.UsePerRequestServices(services => + app.UseServices(services => { // Add MVC services to the services container services.AddMvc(configuration); - services.ConfigureOptions(options => + services.Configure(options => { options.InputFormatters.Clear(); options.InputFormatters.Insert(0, new XmlSerializerInputFormatter());