From 01260515f16ab44ae9b9f8edec5941316d712a8a Mon Sep 17 00:00:00 2001 From: harshgMSFT Date: Tue, 29 Jul 2014 18:25:34 -0700 Subject: [PATCH] Responding to comments --- src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs | 4 ++-- .../Formatters/DefaultOutputFormattersProvider.cs | 2 +- src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs | 3 ++- .../ValueProviderTests.cs | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs index eafb61481e..4e633b5c8e 100644 --- a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs +++ b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs @@ -16,9 +16,9 @@ namespace Microsoft.AspNet.Mvc { public object Value { get; set; } - public List Formatters { get; set; } + public IList Formatters { get; set; } - public List ContentTypes { get; set; } + public IList ContentTypes { get; set; } public Type DeclaredType { get; set; } diff --git a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs index a6b9ee64d4..7b9ff161fe 100644 --- a/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs +++ b/src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs @@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Mvc : base(optionsAccessor.Options.OutputFormatters, typeActivator, serviceProvider) { } - + /// public IReadOnlyList OutputFormatters { diff --git a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs index a248694dd0..2ed21772a1 100644 --- a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs +++ b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs @@ -33,7 +33,8 @@ namespace Microsoft.AspNet.Mvc options.ModelBinders.Add(new ComplexModelDtoModelBinder()); // Set up default output formatters. - options.OutputFormatters.Add(new JsonOutputFormatter(JsonOutputFormatter.CreateDefaultSettings(), false)); + options.OutputFormatters.Add(new JsonOutputFormatter(JsonOutputFormatter.CreateDefaultSettings(), + indent: false)); // Set up ValueProviders options.ValueProviderFactories.Add(new RouteValueValueProviderFactory()); diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs index 2fae97fa1d..9db492a810 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs @@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests _services = TestHelper.CreateServices("ValueProvidersSite"); } - [Fact] + [Fact(Skip = "Skipped until PR#868 is checked in.")] public async Task ValueProviderFactories_AreVisitedInSequentialOrder_ForValueProviders() { // Arrange @@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests Assert.Equal("custom-value-provider-value", body.Trim()); } - [Fact] + [Fact(Skip = "Skipped until PR#868 is checked in.")] public async Task ValueProviderFactories_ReturnsValuesFromQueryValueProvider() { // Arrange @@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests Assert.Equal("query-value", body.Trim()); } - [Fact] + [Fact(Skip = "Skipped until PR#868 is checked in.")] public async Task ValueProviderFactories_ReturnsValuesFromRouteValueProvider() { // Arrange