diff --git a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs index 7c71cbc962..fdef13962d 100644 --- a/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs +++ b/src/Microsoft.AspNet.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs @@ -41,7 +41,7 @@ namespace Microsoft.AspNet.Mvc.ApiExplorer IInlineConstraintResolver constraintResolver, IModelMetadataProvider modelMetadataProvider) { - _outputFormatters = optionsAccessor.Options.OutputFormatters; + _outputFormatters = optionsAccessor.Value.OutputFormatters; _constraintResolver = constraintResolver; _modelMetadataProvider = modelMetadataProvider; } diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs index 22aaf709cc..516c1ac329 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs @@ -252,7 +252,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults .HttpContext .RequestServices .GetRequiredService>() - .Options; + .Value; var respectAcceptHeader = true; if (options.RespectBrowserAcceptHeader == false @@ -311,7 +311,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults .HttpContext .RequestServices .GetRequiredService>() - .Options; + .Value; formatters = options.OutputFormatters; } else diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs index 7c5581f962..b1efd5b344 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionDescriptorProvider.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.Actions { _controllerTypeProvider = controllerTypeProvider; _applicationModelProviders = applicationModelProviders.OrderBy(p => p.Order).ToArray(); - _conventions = optionsAccessor.Options.Conventions; + _conventions = optionsAccessor.Value.Conventions; } public int Order diff --git a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs index 98abbb4f10..1f315dd3e8 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Actions/ControllerActionInvokerProvider.cs @@ -41,13 +41,13 @@ namespace Microsoft.AspNet.Mvc.Actions _controllerFactory = controllerFactory; _filterProviders = filterProviders.OrderBy(item => item.Order).ToArray(); _argumentBinder = argumentBinder; - _inputFormatters = optionsAccessor.Options.InputFormatters.ToArray(); - _outputFormatters = optionsAccessor.Options.OutputFormatters.ToArray(); - _modelBinders = optionsAccessor.Options.ModelBinders.ToArray(); - _modelValidatorProviders = optionsAccessor.Options.ModelValidatorProviders.ToArray(); - _valueProviderFactories = optionsAccessor.Options.ValueProviderFactories.ToArray(); + _inputFormatters = optionsAccessor.Value.InputFormatters.ToArray(); + _outputFormatters = optionsAccessor.Value.OutputFormatters.ToArray(); + _modelBinders = optionsAccessor.Value.ModelBinders.ToArray(); + _modelValidatorProviders = optionsAccessor.Value.ModelValidatorProviders.ToArray(); + _valueProviderFactories = optionsAccessor.Value.ValueProviderFactories.ToArray(); _actionBindingContextAccessor = actionBindingContextAccessor; - _maxModelValidationErrors = optionsAccessor.Options.MaxModelValidationErrors; + _maxModelValidationErrors = optionsAccessor.Value.MaxModelValidationErrors; _logger = loggerFactory.CreateLogger(); _notifier = notifier; } diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs index cbbde2e527..1b051bb8e2 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels public AuthorizationApplicationModelProvider(IOptions authorizationOptionsAccessor) { - _authorizationOptions = authorizationOptionsAccessor.Options; + _authorizationOptions = authorizationOptionsAccessor.Value; } public int Order { get { return DefaultOrder.DefaultFrameworkSortOrder + 10; } } diff --git a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs index 73d9e493b2..58871aae9e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs @@ -22,7 +22,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels public DefaultApplicationModelProvider(IOptions mvcOptionsAccessor) { - _globalFilters = mvcOptionsAccessor.Options.Filters; + _globalFilters = mvcOptionsAccessor.Value.Filters; } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs index fa5a63a5e2..62e3c6dae4 100644 --- a/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs @@ -108,12 +108,12 @@ namespace Microsoft.Framework.DependencyInjection services.TryAddSingleton(); services.TryAdd(ServiceDescriptor.Transient(serviceProvider => { - var options = serviceProvider.GetRequiredService>().Options; + var options = serviceProvider.GetRequiredService>().Value; return new DefaultCompositeMetadataDetailsProvider(options.ModelMetadataDetailsProviders); })); services.TryAdd(ServiceDescriptor.Singleton(serviceProvider => { - var options = serviceProvider.GetRequiredService>().Options; + var options = serviceProvider.GetRequiredService>().Value; var modelMetadataProvider = serviceProvider.GetRequiredService(); return new DefaultObjectValidator(options.ValidationExcludeFilters, modelMetadataProvider); })); diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs index 62eddc78c4..7dc61222c3 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/FormatFilter.cs @@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Mvc.Formatters return; } - ContentType = options.Options.FormatterMappings.GetMediaTypeMappingForFormat(Format); + ContentType = options.Value.FormatterMappings.GetMediaTypeMappingForFormat(Format); } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs index cedec6ef75..5d53d0358a 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Core/MvcCoreMvcOptionsSetup.cs @@ -19,7 +19,6 @@ namespace Microsoft.AspNet.Mvc public MvcCoreMvcOptionsSetup() : base(ConfigureMvc) { - Order = DefaultOrder.DefaultFrameworkSortOrder; } public static void ConfigureMvc(MvcOptions options) diff --git a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs index d963d1295e..f2c5682920 100644 --- a/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Core/MvcCoreRouteOptionsSetup.cs @@ -15,7 +15,6 @@ namespace Microsoft.AspNet.Mvc public MvcCoreRouteOptionsSetup() : base(ConfigureRouting) { - Order = DefaultOrder.DefaultFrameworkSortOrder; } /// diff --git a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs index 5ef5feae50..a16013f08f 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ResponseCacheAttribute.cs @@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Mvc CacheProfile selectedProfile = null; if (CacheProfileName != null) { - optionsAccessor.Options.CacheProfiles.TryGetValue(CacheProfileName, out selectedProfile); + optionsAccessor.Value.CacheProfiles.TryGetValue(CacheProfileName, out selectedProfile); if (selectedProfile == null) { throw new InvalidOperationException(Resources.FormatCacheProfileNotFound(CacheProfileName)); diff --git a/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs index 3f4188dc1a..ccbe7fdbca 100644 --- a/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.DataAnnotations/MvcDataAnnotationsMvcOptionsSetup.cs @@ -15,7 +15,6 @@ namespace Microsoft.AspNet.Mvc public MvcDataAnnotationsMvcOptionsSetup() : base(ConfigureMvc) { - Order = DefaultOrder.DefaultFrameworkSortOrder + 1; } public static void ConfigureMvc(MvcOptions options) diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs index 07405d31c3..3ceb648720 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/ActionResults/JsonResult.cs @@ -94,7 +94,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults .HttpContext .RequestServices .GetRequiredService>() - .Options + .Value .SerializerSettings; } diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs index 9da3be2615..8ea4b63c71 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Json/MvcJsonMvcOptionsSetup.cs @@ -12,9 +12,8 @@ namespace Microsoft.AspNet.Mvc public class MvcJsonMvcOptionsSetup : ConfigureOptions { public MvcJsonMvcOptionsSetup(IOptions jsonOptions) - : base((_) => ConfigureMvc(_, jsonOptions.Options.SerializerSettings)) + : base((_) => ConfigureMvc(_, jsonOptions.Value.SerializerSettings)) { - Order = DefaultOrder.DefaultFrameworkSortOrder + 10; } public static void ConfigureMvc(MvcOptions options, JsonSerializerSettings serializerSettings) diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs index 477cce7120..196348516d 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlDataContractSerializerMvcOptionsSetup.cs @@ -19,7 +19,6 @@ namespace Microsoft.AspNet.Mvc public MvcXmlDataContractSerializerMvcOptionsSetup() : base(ConfigureMvc) { - Order = DefaultOrder.DefaultFrameworkSortOrder + 10; } /// diff --git a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs index 47f9a951a1..43b4861163 100644 --- a/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Formatters.Xml/MvcXmlSerializerMvcOptionsSetup.cs @@ -18,7 +18,6 @@ namespace Microsoft.AspNet.Mvc public MvcXmlSerializerMvcOptionsSetup() : base(ConfigureMvc) { - Order = DefaultOrder.DefaultFrameworkSortOrder + 10; } /// diff --git a/src/Microsoft.AspNet.Mvc.Localization/Internal/MvcLocalizationServices.cs b/src/Microsoft.AspNet.Mvc.Localization/Internal/MvcLocalizationServices.cs index 044cafc0c6..bc82ebd3fe 100644 --- a/src/Microsoft.AspNet.Mvc.Localization/Internal/MvcLocalizationServices.cs +++ b/src/Microsoft.AspNet.Mvc.Localization/Internal/MvcLocalizationServices.cs @@ -19,8 +19,7 @@ namespace Microsoft.AspNet.Mvc.Localization.Internal options => { options.ViewLocationExpanders.Add(new LanguageViewLocationExpander(format)); - }, - DefaultOrder.DefaultFrameworkSortOrder); + }); services.TryAdd(ServiceDescriptor.Singleton()); services.TryAdd(ServiceDescriptor.Transient(typeof(IHtmlLocalizer<>), typeof(HtmlLocalizer<>))); diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs index a403c39b2f..dedf90839c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs @@ -22,7 +22,6 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation /// /// used to locate Razor views. public CompilerCache([NotNull] IFileProvider fileProvider) - { _fileProvider = fileProvider; _cache = new MemoryCache(new MemoryCacheOptions { CompactOnMemoryPressure = false }); } diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs index 890f0f759d..5c90c82ef8 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs @@ -39,7 +39,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation { _compilationService = compilationService; _razorHost = razorHost; - _fileProvider = viewEngineOptions.Options.FileProvider; + _fileProvider = viewEngineOptions.Value.FileProvider; } /// diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs index e183d1b799..46366b8708 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs @@ -63,7 +63,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation _libraryExporter = libraryExporter; _applicationReferences = new Lazy>(GetApplicationReferences); _compilerOptionsProvider = compilerOptionsProvider; - _fileProvider = optionsAccessor.Options.FileProvider; + _fileProvider = optionsAccessor.Value.FileProvider; _classPrefix = host.MainClassNamePrefix; } diff --git a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs index e1413b5cf2..6e1ca62546 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs @@ -54,18 +54,5 @@ namespace Microsoft.Framework.DependencyInjection return builder; } - - public static IMvcBuilder AddPrecompiledRazorViews( - [NotNull] this IMvcBuilder builder, - [NotNull] params Assembly[] assemblies) - { - builder.Services.Replace( - ServiceDescriptor.Singleton(serviceProvider => - ActivatorUtilities.CreateInstance( - serviceProvider, - assemblies.AsEnumerable()))); - - return builder; - } } -} \ No newline at end of file +} diff --git a/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs index 4619cbf870..f2b34755f2 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/MvcRazorMvcViewOptionsSetup.cs @@ -20,7 +20,6 @@ namespace Microsoft.AspNet.Mvc.Razor public MvcRazorMvcViewOptionsSetup(IServiceProvider serviceProvider) : base(options => ConfigureMvc(serviceProvider, options)) { - Order = DefaultOrder.DefaultFrameworkSortOrder; } /// diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs index ff00ab8284..1e44fbf54c 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngine.cs @@ -55,7 +55,7 @@ namespace Microsoft.AspNet.Mvc.Razor { _pageFactory = pageFactory; _viewFactory = viewFactory; - _viewLocationExpanders = optionsAccessor.Options.ViewLocationExpanders; + _viewLocationExpanders = optionsAccessor.Value.ViewLocationExpanders; _viewLocationCache = viewLocationCache; } diff --git a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs index 729521f658..f72c3d9c9a 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/RazorViewEngineOptionsSetup.cs @@ -20,7 +20,6 @@ namespace Microsoft.AspNet.Mvc public RazorViewEngineOptionsSetup(IApplicationEnvironment applicationEnvironment) : base(options => ConfigureRazor(options, applicationEnvironment)) { - Order = DefaultOrder.DefaultFrameworkSortOrder; } private static void ConfigureRazor(RazorViewEngineOptions razorOptions, diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs index 740d7b9e5a..363853e440 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/PartialViewResult.cs @@ -89,7 +89,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults context, ViewData, TempData, - options.Options.HtmlHelperOptions, + options.Value.HtmlHelperOptions, ContentType); } } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs index 1517b29fd0..c3e276bc45 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewComponentResult.cs @@ -69,7 +69,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults var response = context.HttpContext.Response; var services = context.HttpContext.RequestServices; - var htmlHelperOptions = services.GetRequiredService>().Options.HtmlHelperOptions; + var htmlHelperOptions = services.GetRequiredService>().Value.HtmlHelperOptions; var viewComponentHelper = services.GetRequiredService(); var viewData = ViewData; diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs index c3e4fe9d9c..da95914a3b 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ActionResults/ViewResult.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults context, ViewData, TempData, - options.Options.HtmlHelperOptions, + options.Value.HtmlHelperOptions, ContentType); } } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs index 03ba416e4b..b7b73d4bdd 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/MvcViewOptionsSetup.cs @@ -17,7 +17,6 @@ namespace Microsoft.AspNet.Mvc public MvcViewOptionsSetup() : base(ConfigureMvc) { - Order = DefaultOrder.DefaultFrameworkSortOrder; } public static void ConfigureMvc(MvcViewOptions options) diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs index 5eaca77bec..731bc5fc30 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/Html/DefaultHtmlGenerator.cs @@ -49,14 +49,14 @@ namespace Microsoft.AspNet.Mvc.Rendering [NotNull] IHtmlEncoder htmlEncoder) { _antiforgery = antiforgery; - var clientValidatorProviders = optionsAccessor.Options.ClientModelValidatorProviders; + var clientValidatorProviders = optionsAccessor.Value.ClientModelValidatorProviders; _clientModelValidatorProvider = new CompositeClientModelValidatorProvider(clientValidatorProviders); _metadataProvider = metadataProvider; _urlHelper = urlHelper; _htmlEncoder = htmlEncoder; // Underscores are fine characters in id's. - IdAttributeDotReplacement = optionsAccessor.Options.HtmlHelperOptions.IdAttributeDotReplacement; + IdAttributeDotReplacement = optionsAccessor.Value.HtmlHelperOptions.IdAttributeDotReplacement; } /// diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs index fe0af4b398..1467a38c67 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/Rendering/ViewEngine/CompositeViewEngine.cs @@ -18,7 +18,7 @@ namespace Microsoft.AspNet.Mvc.Rendering /// The options accessor for . public CompositeViewEngine(IOptions optionsAccessor) { - ViewEngines = optionsAccessor.Options.ViewEngines.ToArray(); + ViewEngines = optionsAccessor.Value.ViewEngines.ToArray(); } /// diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs index d9866d99cd..295d431427 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewComponents/JsonViewComponentResult.cs @@ -56,7 +56,7 @@ namespace Microsoft.AspNet.Mvc.ViewComponents .HttpContext .RequestServices .GetRequiredService>() - .Options + .Value .SerializerSettings; } diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs index 33557b23d5..850ef43fca 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/HttpRequestMessage/HttpRequestMessageExtensions.cs @@ -6,7 +6,6 @@ using System.Net.Http.Formatting; using System.Net.Http.Headers; using System.Web.Http; using Microsoft.AspNet.Http; -using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.ModelBinding; using Microsoft.AspNet.Mvc.WebApiCompatShim; using Microsoft.Framework.DependencyInjection; @@ -244,7 +243,7 @@ namespace System.Net.Http { // Get the default formatters from options var options = context.RequestServices.GetRequiredService>(); - formatters = options.Options.Formatters; + formatters = options.Value.Formatters; } var contentNegotiator = context.RequestServices.GetRequiredService(); @@ -306,7 +305,7 @@ namespace System.Net.Http // Get the default formatters from options var options = context.RequestServices.GetRequiredService>(); - var formatters = options.Options.Formatters; + var formatters = options.Value.Formatters; var formatter = formatters.FindWriter(typeof(T), mediaType); if (formatter == null) diff --git a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs index dea74e2c37..242e0784e9 100644 --- a/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc.WebApiCompatShim/WebApiCompatShimOptionsSetup.cs @@ -13,15 +13,9 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim { public static readonly string DefaultAreaName = "api"; - public int Order - { - // We want to run after the default MvcOptionsSetup. - get { return DefaultOrder.DefaultFrameworkSortOrder + 100; } - } - public string Name { get; set; } - public void Configure(MvcOptions options, string name = "") + public void Configure(MvcOptions options) { // Add webapi behaviors to controllers with the appropriate attributes options.Conventions.Add(new WebApiActionConventionsApplicationModelConvention()); @@ -42,7 +36,7 @@ namespace Microsoft.AspNet.Mvc.WebApiCompatShim options.ValidationExcludeFilters.Add(typeof(HttpResponseMessage)); } - public void Configure(WebApiCompatShimOptions options, string name = "") + public void Configure(WebApiCompatShimOptions options) { // Add the default formatters options.Formatters.AddRange(new MediaTypeFormatterCollection()); diff --git a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs index 89bdd09e3b..20491452f8 100644 --- a/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs +++ b/src/Microsoft.AspNet.Mvc/MvcServiceCollectionExtensions.cs @@ -21,18 +21,26 @@ namespace Microsoft.Framework.DependencyInjection builder.AddApiExplorer(); builder.AddAuthorization(); - builder.AddCors(); - builder.AddDataAnnotations(); + + // Order added affects options setup order + + // Default framework order builder.AddFormatterMappings(); - builder.AddJsonFormatters(); builder.AddViews(); builder.AddRazorViewEngine(); + // +1 order + builder.AddDataAnnotations(); // +1 order + + // +10 order + builder.AddJsonFormatters(); + + builder.AddCors(); + if (setupAction != null) { builder.Services.Configure(setupAction); } - return new MvcBuilder(services); } } diff --git a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs index 84a680090f..79b97cf14a 100644 --- a/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs @@ -1004,7 +1004,7 @@ namespace Microsoft.AspNet.Mvc.Description } var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(options); var constraintResolver = new Mock(); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs index ca1b88525d..59eb2b0dc3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtActionResultTests.cs @@ -97,8 +97,9 @@ namespace Microsoft.AspNet.Mvc.ActionResults httpContext.RequestServices = services.Object; var optionsAccessor = new TestOptionsManager(); - optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter()); - optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter()); + var optionsAccessor = new MockMvcOptionsAccessor(); + optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); services.Setup(p => p.GetService(typeof(IOptions))) .Returns(optionsAccessor); services.Setup(s => s.GetService(typeof(ILogger))) @@ -106,7 +107,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults var actionBindingContext = new ActionBindingContext { - OutputFormatters = optionsAccessor.Options.OutputFormatters + OutputFormatters = optionsAccessor.Value.OutputFormatters }; services.Setup(o => o.GetService(typeof(IActionBindingContextAccessor))) .Returns(new ActionBindingContextAccessor() { ActionBindingContext = actionBindingContext }); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs index a01cd76602..0cdab1c7f5 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedAtRouteResultTests.cs @@ -102,8 +102,8 @@ namespace Microsoft.AspNet.Mvc.ActionResults httpContext.Setup(o => o.Request) .Returns(request); var optionsAccessor = new TestOptionsManager(); - optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter()); - optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); httpContext.Setup(o => o.RequestServices.GetService(typeof(IOptions))) .Returns(optionsAccessor); httpContext.Setup(o => o.RequestServices.GetService(typeof(ILogger))) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs index 358a140320..e419734f41 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/CreatedResultTests.cs @@ -90,8 +90,8 @@ namespace Microsoft.AspNet.Mvc.ActionResults httpContext.Setup(o => o.Response) .Returns(response); var optionsAccessor = new TestOptionsManager(); - optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter()); - optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); httpContext .Setup(p => p.RequestServices.GetService(typeof(IOptions))) .Returns(optionsAccessor); @@ -101,7 +101,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults var actionBindingContext = new ActionBindingContext() { - OutputFormatters = optionsAccessor.Options.OutputFormatters + OutputFormatters = optionsAccessor.Value.OutputFormatters }; httpContext .Setup(o => o.RequestServices.GetService(typeof(IActionBindingContextAccessor))) diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs index 3b65711e6a..6995367c54 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpNotFoundObjectResultTest.cs @@ -89,14 +89,14 @@ namespace Microsoft.AspNet.Mvc.ActionResults httpContext.Setup(o => o.Request).Returns(request); httpContext.Setup(o => o.RequestServices).Returns(GetServiceProvider()); var optionsAccessor = new TestOptionsManager(); - optionsAccessor.Options.OutputFormatters.Add(new StringOutputFormatter()); - optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter()); - optionsAccessor.Options.RespectBrowserAcceptHeader = respectBrowserAcceptHeader; + optionsAccessor.Value.OutputFormatters.Add(new StringOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); + optionsAccessor.Value.RespectBrowserAcceptHeader = respectBrowserAcceptHeader; var actionBindingContextAccessor = new ActionBindingContextAccessor() { ActionBindingContext = new ActionBindingContext() { - OutputFormatters = optionsAccessor.Options.OutputFormatters + OutputFormatters = optionsAccessor.Value.OutputFormatters } }; @@ -114,7 +114,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults { var options = new MvcOptions(); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options).Returns(options); + optionsAccessor.SetupGet(o => o.Value).Returns(options); var serviceCollection = new ServiceCollection(); serviceCollection.AddInstance(optionsAccessor.Object); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs index a0e62d0b60..b34db7e514 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/HttpOkObjectResultTest.cs @@ -76,12 +76,12 @@ namespace Microsoft.AspNet.Mvc.ActionResults new Logger(NullLoggerFactory.Instance))); var optionsAccessor = new TestOptionsManager(); - optionsAccessor.Options.OutputFormatters.Add(new JsonOutputFormatter()); + optionsAccessor.Value.OutputFormatters.Add(new JsonOutputFormatter()); services.Add(new ServiceDescriptor(typeof(IOptions), optionsAccessor)); var bindingContext = new ActionBindingContext { - OutputFormatters = optionsAccessor.Options.OutputFormatters, + OutputFormatters = optionsAccessor.Value.OutputFormatters, }; var bindingContextAccessor = new ActionBindingContextAccessor { diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs index c8a5675f7c..33bb20bc8c 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ActionResults/ObjectResultTests.cs @@ -899,10 +899,10 @@ namespace Microsoft.AspNet.Mvc.ActionResults var optionsAccessor = new TestOptionsManager(); foreach (var formatter in outputFormatters) { - optionsAccessor.Options.OutputFormatters.Add(formatter); + optionsAccessor.Value.OutputFormatters.Add(formatter); } - optionsAccessor.Options.RespectBrowserAcceptHeader = respectBrowserAcceptHeader; + optionsAccessor.Value.RespectBrowserAcceptHeader = respectBrowserAcceptHeader; httpContext.Setup(o => o.RequestServices.GetService(typeof(IOptions))) .Returns(optionsAccessor); httpContext.Setup(o => o.RequestServices.GetService(typeof(ILogger))) @@ -946,7 +946,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults { var options = new MvcOptions(); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options).Returns(options); + optionsAccessor.SetupGet(o => o.Value).Returns(options); var serviceCollection = new ServiceCollection(); serviceCollection.AddInstance(optionsAccessor.Object); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs index ad06890d44..f1e882d9de 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionDescriptorProviderTests.cs @@ -1259,8 +1259,7 @@ namespace Microsoft.AspNet.Mvc.Actions .Callback(() => { Assert.Equal(3, sequence++); }); var options = new TestOptionsManager(); - options.Options.Conventions.Add(applicationConvention.Object); - + options.Value.Conventions.Add(applicationConvention.Object); var applicationModel = new ApplicationModel(); @@ -1281,7 +1280,7 @@ namespace Microsoft.AspNet.Mvc.Actions actionModel.Parameters.Add(parameterModel); // Act - ApplicationModelConventions.ApplyConventions(applicationModel, options.Options.Conventions); + ApplicationModelConventions.ApplyConventions(applicationModel, options.Value.Conventions); // Assert Assert.Equal(4, sequence); @@ -1440,7 +1439,7 @@ namespace Microsoft.AspNet.Mvc.Actions { foreach (var filter in filters) { - options.Options.Filters.Add(filter); + options.Value.Filters.Add(filter); } } @@ -1476,7 +1475,7 @@ namespace Microsoft.AspNet.Mvc.Actions IApplicationModelConvention convention) { var options = new TestOptionsManager(); - options.Options.Conventions.Add(convention); + options.Value.Conventions.Add(convention); var controllerTypeProvider = new StaticControllerTypeProvider(new[] { controllerTypeInfo }); var modelProvider = new DefaultApplicationModelProvider(options); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs index 029bd0c591..1f73ddd3e3 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Actions/ControllerActionInvokerTest.cs @@ -2004,7 +2004,7 @@ namespace Microsoft.AspNet.Mvc.Actions var optionsAccessor = new Mock>(); optionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(options); httpContext diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs index 68f3ae2a9e..179c8a59c2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/AuthorizationApplicationModelProviderTest.cs @@ -34,8 +34,8 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels { // Arrange var options = new TestOptionsManager(); - options.Options.AddPolicy("Base", policy => policy.RequireClaim("Basic").RequireClaim("Basic2")); - options.Options.AddPolicy("Derived", policy => policy.RequireClaim("Derived")); + options.Value.AddPolicy("Base", policy => policy.RequireClaim("Basic").RequireClaim("Basic2")); + options.Value.AddPolicy("Derived", policy => policy.RequireClaim("Derived")); var provider = new AuthorizationApplicationModelProvider(options); var defaultProvider = new DefaultApplicationModelProvider(new TestOptionsManager()); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs index 511773bd71..afadbe0b9b 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ApplicationModel/DefaultApplicationModelProviderTest.cs @@ -1219,7 +1219,7 @@ namespace Microsoft.AspNet.Mvc.ApplicationModels IOptions options) : base(options) { - Options = options.Options; + Options = options.Value; } public MvcOptions Options { get; } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs index 55bab8570e..0728686675 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Formatters/FormatFilterTest.cs @@ -388,7 +388,7 @@ namespace Microsoft.AspNet.Mvc.Formatters OptionsManager = new TestOptionsManager(); // Setup options on mock service provider - Options = OptionsManager.Options; + Options = OptionsManager.Value; // Set up default output formatters. Options.OutputFormatters.Add(new HttpNoContentOutputFormatter()); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs new file mode 100644 index 0000000000..5b14ad56f5 --- /dev/null +++ b/test/Microsoft.AspNet.Mvc.Core.Test/MockMvcOptionsAccessor.cs @@ -0,0 +1,17 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.Framework.OptionsModel; + +namespace Microsoft.AspNet.Mvc +{ + public class MockMvcOptionsAccessor : IOptions + { + public MockMvcOptionsAccessor() + { + Value = new MvcOptions(); + } + + public MvcOptions Value { get; private set; } + } +} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs index 8ffa61423d..2d345e642f 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/ResponseCacheAttributeTest.cs @@ -189,7 +189,7 @@ namespace Microsoft.AspNet.Mvc { foreach (var p in cacheProfiles) { - optionsAccessor.Options.CacheProfiles.Add(p.Key, p.Value); + optionsAccessor.Value.CacheProfiles.Add(p.Key, p.Value); } } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutePrecedenceTests.cs index d032641615..72b3eeeaa5 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>(); - options.SetupGet(o => o.Options).Returns(new RouteOptions()); + options.SetupGet(o => o.Value).Returns(new RouteOptions()); var parsed = TemplateParser.Parse(template); return AttributeRoutePrecedence.Compute(parsed); diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs index a2c89b0586..e53f9873d2 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/AttributeRoutingTest.cs @@ -186,7 +186,7 @@ namespace Microsoft.AspNet.Mvc.Routing var routeOptions = new Mock>(); routeOptions - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(new RouteOptions()); services diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/InnerAttributeRouteTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/InnerAttributeRouteTest.cs index 9fa12d9a17..1539bc514a 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/Routing/InnerAttributeRouteTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/Routing/InnerAttributeRouteTest.cs @@ -1729,7 +1729,7 @@ namespace Microsoft.AspNet.Mvc.Routing { var options = new RouteOptions(); var optionsMock = new Mock>(); - optionsMock.SetupGet(o => o.Options).Returns(options); + optionsMock.SetupGet(o => o.Value).Returns(options); return new DefaultInlineConstraintResolver(optionsMock.Object); } diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs index ef59d41eff..66b48a4d7d 100644 --- a/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.Core.Test/UrlHelperTest.cs @@ -951,7 +951,7 @@ namespace Microsoft.AspNet.Mvc var optionsAccessor = new Mock>(); optionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(new RouteOptions()); services .Setup(s => s.GetService(typeof(IOptions))) diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs index 50ca9b1853..2298560f39 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/ModelBindingTestHelper.cs @@ -59,7 +59,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests public static IObjectModelValidator GetObjectValidator(MvcOptions options = null) { - options = options ?? new TestMvcOptions().Options; + options = options ?? new TestMvcOptions().Value; options.MaxModelValidationErrors = 5; var metadataProvider = TestModelMetadataProvider.CreateDefaultProvider(); return new DefaultObjectValidator( @@ -80,7 +80,7 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests httpContext.RequestServices.GetRequiredService(); actionContextAccessor.ActionContext = actionContext; - var options = new TestMvcOptions().Options; + var options = new TestMvcOptions().Value; if (updateOptions != null) { updateOptions(options); diff --git a/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs b/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs index 55c5b88954..1d0ebf4d22 100644 --- a/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs +++ b/test/Microsoft.AspNet.Mvc.IntegrationTests/TestMvcOptions.cs @@ -11,17 +11,12 @@ namespace Microsoft.AspNet.Mvc.IntegrationTests { public TestMvcOptions() { - Options = new MvcOptions(); - MvcCoreMvcOptionsSetup.ConfigureMvc(Options); - MvcDataAnnotationsMvcOptionsSetup.ConfigureMvc(Options); - MvcJsonMvcOptionsSetup.ConfigureMvc(Options, SerializerSettingsProvider.CreateSerializerSettings()); + Value = new MvcOptions(); + MvcCoreMvcOptionsSetup.ConfigureMvc(Value); + MvcDataAnnotationsMvcOptionsSetup.ConfigureMvc(Value); + MvcJsonMvcOptionsSetup.ConfigureMvc(Value, SerializerSettingsProvider.CreateSerializerSettings()); } - public MvcOptions Options { get; } - - public MvcOptions GetNamedOptions(string name) - { - throw new NotImplementedException(); - } + public MvcOptions Value { get; } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs index 735ced0d36..ed2030acaf 100644 --- a/test/Microsoft.AspNet.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.Localization.Test/Internal/MvcLocalizationServiceCollectionExtensionsTest.cs @@ -123,11 +123,13 @@ namespace Microsoft.AspNet.Mvc.Localization.Internal Assert.Equal(typeof(IConfigureOptions), services[0].ServiceType); Assert.Equal(ServiceLifetime.Singleton, services[0].Lifetime); - Assert.Equal(0, ((IConfigureOptions)services[0].ImplementationInstance).Order); + // REVIEW: What should this be replaced with? + //Assert.Equal(0, ((IConfigureOptions)services[0].ImplementationInstance).Order); Assert.Equal(typeof(IConfigureOptions), services[1].ServiceType); Assert.Equal(ServiceLifetime.Singleton, services[1].Lifetime); - Assert.Equal(-1000, ((IConfigureOptions)services[1].ImplementationInstance).Order); + // REVIEW: What should this be replaced with? + //Assert.Equal(-1000, ((IConfigureOptions)services[1].ImplementationInstance).Order); Assert.Equal(typeof(IHtmlLocalizerFactory), services[2].ServiceType); Assert.Equal(typeof(HtmlLocalizerFactory), services[2].ImplementationType); diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs index c718617958..6e96d4a1f1 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs @@ -218,7 +218,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Compilation FileProvider = fileProvider ?? new TestFileProvider() }; var options = new Mock>(); - options.SetupGet(o => o.Options) + options.SetupGet(o => o.Value) .Returns(razorViewEngineOptions); return options.Object; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs index d6f8d10c83..add5d6d875 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs @@ -267,7 +267,7 @@ public class NotRazorPrefixType {}"; var fileProvider = new TestFileProvider(); fileProvider.AddFile(viewPath, "view-content"); var options = new Mock>(); - options.SetupGet(o => o.Options) + options.SetupGet(o => o.Value) .Returns(new RazorViewEngineOptions { FileProvider = fileProvider @@ -416,7 +416,7 @@ public class NotRazorPrefixType {}"; FileProvider = fileProvider ?? new TestFileProvider() }; var options = new Mock>(); - options.SetupGet(o => o.Options) + options.SetupGet(o => o.Value) .Returns(razorViewEngineOptions); return options.Object; diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs index bdad61813b..b06d1104ea 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorViewEngineTest.cs @@ -1112,7 +1112,7 @@ namespace Microsoft.AspNet.Mvc.Razor.Test } var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(v => v.Options) + optionsAccessor.SetupGet(v => v.Value) .Returns(options); return optionsAccessor.Object; } diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs index 3be6a0a327..d9e549987e 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs @@ -100,7 +100,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { var mockOptions = new Mock>(); mockOptions - .SetupGet(options => options.Options) + .SetupGet(options => options.Value) .Returns(new MvcViewOptions()); return mockOptions.Object; diff --git a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs index 32711d5d36..2c29737533 100644 --- a/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs +++ b/test/Microsoft.AspNet.Mvc.Test/MvcOptionsSetupTest.cs @@ -193,8 +193,8 @@ namespace Microsoft.AspNet.Mvc var services = GetServiceProvider(); // Act - var options = services.GetRequiredService>().Options; - var jsonOptions = services.GetRequiredService>().Options; + var options = services.GetRequiredService>().Value; + var jsonOptions = services.GetRequiredService>().Value; // Assert var jsonInputFormatters = options.InputFormatters.OfType(); @@ -214,7 +214,7 @@ namespace Microsoft.AspNet.Mvc where T : class, new() { var serviceProvider = GetServiceProvider(action); - return serviceProvider.GetRequiredService>().Options; + return serviceProvider.GetRequiredService>().Value; } private static IServiceProvider GetServiceProvider(Action action = null) diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs index 672da2db2d..abccec3b7f 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/PartialViewResultTest.cs @@ -199,7 +199,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults serviceProvider.Setup(s => s.GetService(typeof(IOptions))) .Returns(() => { var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(new MvcViewOptions()); return optionsAccessor.Object; }); @@ -226,7 +226,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults serviceProvider.Setup(s => s.GetService(typeof(IOptions))) .Returns(() => { var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(new MvcViewOptions()); return optionsAccessor.Object; }); diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs index 28e35b042c..dfb3bb424d 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/ActionResults/ViewResultTest.cs @@ -216,7 +216,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults serviceProvider.Setup(s => s.GetService(typeof(IOptions))) .Returns(() => { var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(new MvcViewOptions()); return optionsAccessor.Object; }); @@ -310,7 +310,7 @@ namespace Microsoft.AspNet.Mvc.ActionResults .Returns(new Mock>().Object); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(new MvcViewOptions()); serviceProvider.Setup(s => s.GetService(typeof(IOptions))) diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs index 9f3356d08f..98e78ec5e8 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/MockMvcViewOptionsAccessor.cs @@ -9,14 +9,9 @@ namespace Microsoft.AspNet.Mvc { public MockMvcViewOptionsAccessor() { - Options = new MvcViewOptions(); + Value = new MvcViewOptions(); } - public MvcViewOptions Options { get; private set; } - - public MvcViewOptions GetNamedOptions(string name) - { - return Options; - } + public MvcViewOptions Value { get; private set; } } } \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs index 0bf99ffc5f..e4e741fb26 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs @@ -574,7 +574,7 @@ namespace Microsoft.AspNet.Mvc var routeOptions = new RouteOptions(); var accessor = new Mock>(); accessor - .SetupGet(options => options.Options) + .SetupGet(options => options.Value) .Returns(routeOptions); serviceCollection.AddInstance>(accessor.Object); diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs index c908dc83eb..ed101c6682 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultHtmlGeneratorTest.cs @@ -640,13 +640,13 @@ namespace Microsoft.AspNet.Mvc.Rendering private static IHtmlGenerator GetGenerator(IModelMetadataProvider metadataProvider) { var mvcViewOptionsAccessor = new Mock>(); - mvcViewOptionsAccessor.SetupGet(accessor => accessor.Options).Returns(new MvcViewOptions()); + mvcViewOptionsAccessor.SetupGet(accessor => accessor.Value).Returns(new MvcViewOptions()); var htmlEncoder = Mock.Of(); var antiforgery = Mock.Of(); var optionsAccessor = new Mock>(); optionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(new MvcOptions()); return new DefaultHtmlGenerator( diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs index b899877145..f125db9566 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs @@ -221,7 +221,7 @@ namespace Microsoft.AspNet.Mvc.Rendering options.ClientModelValidatorProviders.Add(new DataAnnotationsClientModelValidatorProvider()); var optionsAccessor = new Mock>(); optionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(options); var serviceProvider = new Mock(); diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs index 90c28554b9..a7732021c3 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/ViewEngine/CompositeViewEngineTest.cs @@ -20,8 +20,8 @@ namespace Microsoft.AspNet.Mvc.Rendering var viewEngine1 = Mock.Of(); var viewEngine2 = Mock.Of(); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(viewEngine1); - optionsAccessor.Options.ViewEngines.Add(viewEngine2); + optionsAccessor.Value.ViewEngines.Add(viewEngine1); + optionsAccessor.Value.ViewEngines.Add(viewEngine2); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -58,7 +58,7 @@ namespace Microsoft.AspNet.Mvc.Rendering engine.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.NotFound(viewName, new[] { "controller/test-view" })); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine.Object); + optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -79,7 +79,7 @@ namespace Microsoft.AspNet.Mvc.Rendering engine.Setup(e => e.FindView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view)); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine.Object); + optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -108,9 +108,9 @@ namespace Microsoft.AspNet.Mvc.Rendering .Returns(ViewEngineResult.Found(viewName, view3)); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine1.Object); - optionsAccessor.Options.ViewEngines.Add(engine2.Object); - optionsAccessor.Options.ViewEngines.Add(engine3.Object); + optionsAccessor.Value.ViewEngines.Add(engine1.Object); + optionsAccessor.Value.ViewEngines.Add(engine2.Object); + optionsAccessor.Value.ViewEngines.Add(engine3.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -138,9 +138,9 @@ namespace Microsoft.AspNet.Mvc.Rendering .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" })); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine1.Object); - optionsAccessor.Options.ViewEngines.Add(engine2.Object); - optionsAccessor.Options.ViewEngines.Add(engine3.Object); + optionsAccessor.Value.ViewEngines.Add(engine1.Object); + optionsAccessor.Value.ViewEngines.Add(engine2.Object); + optionsAccessor.Value.ViewEngines.Add(engine3.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -197,7 +197,7 @@ namespace Microsoft.AspNet.Mvc.Rendering engine.Setup(e => e.FindPartialView(It.IsAny(), It.IsAny())) .Returns(ViewEngineResult.Found(viewName, view)); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine.Object); + optionsAccessor.Value.ViewEngines.Add(engine.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -226,9 +226,9 @@ namespace Microsoft.AspNet.Mvc.Rendering .Returns(ViewEngineResult.Found(viewName, view3)); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine1.Object); - optionsAccessor.Options.ViewEngines.Add(engine2.Object); - optionsAccessor.Options.ViewEngines.Add(engine3.Object); + optionsAccessor.Value.ViewEngines.Add(engine1.Object); + optionsAccessor.Value.ViewEngines.Add(engine2.Object); + optionsAccessor.Value.ViewEngines.Add(engine3.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act @@ -256,9 +256,9 @@ namespace Microsoft.AspNet.Mvc.Rendering .Returns(ViewEngineResult.NotFound(viewName, new[] { "4", "5" })); var optionsAccessor = new MockMvcViewOptionsAccessor(); - optionsAccessor.Options.ViewEngines.Add(engine1.Object); - optionsAccessor.Options.ViewEngines.Add(engine2.Object); - optionsAccessor.Options.ViewEngines.Add(engine3.Object); + optionsAccessor.Value.ViewEngines.Add(engine1.Object); + optionsAccessor.Value.ViewEngines.Add(engine2.Object); + optionsAccessor.Value.ViewEngines.Add(engine3.Object); var compositeViewEngine = new CompositeViewEngine(optionsAccessor); // Act diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs index 19144c6610..0b384040b1 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs @@ -73,7 +73,7 @@ namespace System.Web.Http options.OutputFormatters.Add(new JsonOutputFormatter()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(options); var actionBindingContext = new ActionBindingContext { OutputFormatters = options.OutputFormatters }; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs index b34b84e596..5dcd987839 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs @@ -73,7 +73,7 @@ namespace System.Web.Http options.OutputFormatters.Add(new JsonOutputFormatter()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(options); var actionBindingContext = new ActionBindingContext { OutputFormatters = options.OutputFormatters }; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs index d34d0817f1..f617f6e378 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs @@ -86,7 +86,7 @@ namespace System.Web.Http options.OutputFormatters.Add(new JsonOutputFormatter()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(options); var actionBindingContext = new ActionBindingContext { OutputFormatters = options.OutputFormatters }; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs index 4fe485d6f5..8eb4b13d36 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs @@ -74,7 +74,7 @@ namespace System.Web.Http options.OutputFormatters.Add(new JsonOutputFormatter()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options) + optionsAccessor.SetupGet(o => o.Value) .Returns(options); var actionBindingContext = new ActionBindingContext { OutputFormatters = options.OutputFormatters }; diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs index 10760c19ca..974229060f 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerActionDiscoveryTest.cs @@ -383,12 +383,12 @@ namespace System.Web.Http var optionsAccessor = new Mock>(); optionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(options); var authorizationOptionsAccessor = new Mock>(); authorizationOptionsAccessor - .SetupGet(o => o.Options) + .SetupGet(o => o.Value) .Returns(new AuthorizationOptions()); var modelProvider = new DefaultApplicationModelProvider(optionsAccessor.Object); diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs index 009b981be5..6049af8c12 100644 --- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs +++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/HttpRequestMessage/HttpRequestMessageExtensionsTest.cs @@ -68,7 +68,7 @@ namespace System.Net.Http options.Formatters.AddRange(new MediaTypeFormatterCollection()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options).Returns(options); + optionsAccessor.SetupGet(o => o.Value).Returns(options); services .Setup(s => s.GetService(typeof(IOptions))) @@ -101,7 +101,7 @@ namespace System.Net.Http options.Formatters.AddRange(new MediaTypeFormatterCollection()); var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options).Returns(options); + optionsAccessor.SetupGet(o => o.Value).Returns(options); services .Setup(s => s.GetService(typeof(IOptions))) @@ -322,7 +322,7 @@ namespace System.Net.Http } var optionsAccessor = new Mock>(); - optionsAccessor.SetupGet(o => o.Options).Returns(options); + optionsAccessor.SetupGet(o => o.Value).Returns(options); var services = new Mock(MockBehavior.Strict); services