huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Responding to comments

This commit is contained in:
harshgMSFT 2014-07-29 18:25:34 -07:00
parent 2fe2efa94a
commit 01260515f1
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Mvc.Core/ActionResults/ObjectResult.cs
View File

@ -16,9 +16,9 @@ namespace Microsoft.AspNet.Mvc
{ {
public object Value { get; set; } 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; } public Type DeclaredType { get; set; }

2
src/Microsoft.AspNet.Mvc.Core/Formatters/DefaultOutputFormattersProvider.cs
View File

@ -25,7 +25,7 @@ namespace Microsoft.AspNet.Mvc
: base(optionsAccessor.Options.OutputFormatters, typeActivator, serviceProvider) : base(optionsAccessor.Options.OutputFormatters, typeActivator, serviceProvider)
{ {
} }
/// <inheritdoc /> /// <inheritdoc />
public IReadOnlyList<IOutputFormatter> OutputFormatters public IReadOnlyList<IOutputFormatter> OutputFormatters
{ {

3
src/Microsoft.AspNet.Mvc/MvcOptionsSetup.cs
View File

@ -33,7 +33,8 @@ namespace Microsoft.AspNet.Mvc
options.ModelBinders.Add(new ComplexModelDtoModelBinder()); options.ModelBinders.Add(new ComplexModelDtoModelBinder());
// Set up default output formatters. // 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 // Set up ValueProviders
options.ValueProviderFactories.Add(new RouteValueValueProviderFactory()); options.ValueProviderFactories.Add(new RouteValueValueProviderFactory());

6
test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTests.cs
View File

@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
_services = TestHelper.CreateServices("ValueProvidersSite"); _services = TestHelper.CreateServices("ValueProvidersSite");
} }
[Fact] [Fact(Skip = "Skipped until PR#868 is checked in.")]
public async Task ValueProviderFactories_AreVisitedInSequentialOrder_ForValueProviders() public async Task ValueProviderFactories_AreVisitedInSequentialOrder_ForValueProviders()
{ {
// Arrange // Arrange
@ -35,7 +35,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("custom-value-provider-value", body.Trim()); Assert.Equal("custom-value-provider-value", body.Trim());
} }
[Fact] [Fact(Skip = "Skipped until PR#868 is checked in.")]
public async Task ValueProviderFactories_ReturnsValuesFromQueryValueProvider() public async Task ValueProviderFactories_ReturnsValuesFromQueryValueProvider()
{ {
// Arrange // Arrange
@ -50,7 +50,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests
Assert.Equal("query-value", body.Trim()); Assert.Equal("query-value", body.Trim());
} }
[Fact] [Fact(Skip = "Skipped until PR#868 is checked in.")]
public async Task ValueProviderFactories_ReturnsValuesFromRouteValueProvider() public async Task ValueProviderFactories_ReturnsValuesFromRouteValueProvider()
{ {
// Arrange // Arrange