Merge branch 'release/2.2'

This commit is contained in:
John Luo 2019-06-07 16:42:15 -07:00
commit aaf0a1c43a
1 changed files with 2 additions and 1 deletions

View File

@ -342,7 +342,8 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders
Assert.True(bindingContext.ModelState.ContainsKey("theModelName"));
}
[Theory]
[ConditionalTheory]
[OSSkipCondition(OperatingSystems.Linux, SkipReason = "https://github.com/aspnet/AspNetCore-Internal/issues/2626")]
[MemberData(nameof(ConvertibleTypeData))]
[Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2626", FlakyOn.AzP.Linux)]
public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwoThousandPointOne(Type destinationType)