Merge in 'release/2.1' changes

dotnet-bot · dotnet-bot · commit 800f38032560 · 2019-06-11T21:36:23.000Z
diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
@@ -351,7 +351,7 @@ public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwo
             var bindingContext = GetBindingContext(destinationType);
             bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR"))
             {
-                { "theModelName", "32 000,1" }
+                { "theModelName", "32000,1" }
             };
             var binder = GetBinder();
 

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ public async Task BindModel_ReturnsModel_IfAttemptedValueIsValid_FrenchThirtyTwo`
`351`	`351`	`var bindingContext = GetBindingContext(destinationType);`
`352`	`352`	`bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR"))`
`353`	`353`	`{`
`354`		`- { "theModelName", "32 000,1" }`
	`354`	`+ { "theModelName", "32000,1" }`
`355`	`355`	`};`
`356`	`356`	`var binder = GetBinder();`
`357`	`357`