From d805ee112b9961fe19b693a3d5ce065c7ee71894 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 11 Jun 2019 14:35:20 -0700 Subject: [PATCH 1/2] Make the test input a bit more reasonable (#11096) Fixes https://github.com/aspnet/AspNetCore-Internal/issues/2626 --- .../ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/Mvc.Core/test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs index 688eb026a5a0..c4c93f12f9eb 100644 --- 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(); From f74ca433b42bb48c2b12a83ae5530dc374c5b04f Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 14 Jun 2019 13:29:00 -0700 Subject: [PATCH 2/2] Always include ANCM in build output (#11199) --- Directory.Build.targets | 3 +++ .../Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj | 1 + 2 files changed, 4 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index b0f161d1eda7..e1781e0c0653 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -11,6 +11,9 @@ true $(PackagesInPatch.Contains(' $(PackageId);')) + + + true diff --git a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj index 29f79f80b083..7117d89f5510 100644 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj +++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModuleV1.pkgproj @@ -10,6 +10,7 @@ content true ASP.NET Core Module + true