Responding to comments

tonyinsect · Jul 30, 2014 · 0126051 · 0126051
1 parent 2fe2efa
commit 0126051
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs b/src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
@@ -16,9 +16,9 @@ public class ObjectResult : ActionResult
     {
         public object Value { get; set; }
 
-        public List<IOutputFormatter> Formatters { get; set; }
+        public IList<IOutputFormatter> Formatters { get; set; }
 
-        public List<MediaTypeHeaderValue> ContentTypes { get; set; }
+        public IList<MediaTypeHeaderValue> 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
@@ -25,7 +25,7 @@ public DefaultOutputFormattersProvider(IOptionsAccessor<MvcOptions> optionsAcces
             : base(optionsAccessor.Options.OutputFormatters, typeActivator, serviceProvider)
         {
         }
-    
+
         /// <inheritdoc />
         public IReadOnlyList<IOutputFormatter> OutputFormatters
         {

diff --git a/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs b/src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs
@@ -33,7 +33,8 @@ public void Setup(MvcOptions options)
             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
@@ -20,7 +20,7 @@ public ValueProviderTest()
             _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 @@ public async Task ValueProviderFactories_AreVisitedInSequentialOrder_ForValuePro
             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 @@ public async Task ValueProviderFactories_ReturnsValuesFromQueryValueProvider()
             Assert.Equal("query-value", body.Trim());
         }
 
-        [Fact]
+        [Fact(Skip = "Skipped until PR#868 is checked in.")]
         public async Task ValueProviderFactories_ReturnsValuesFromRouteValueProvider()
         {
             // Arrange