From d805ee112b9961fe19b693a3d5ce065c7ee71894 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 11 Jun 2019 14:35:20 -0700 Subject: [PATCH 1/6] 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 688eb026a5..c4c93f12f9 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 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders var bindingContext = GetBindingContext(destinationType); bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR")) { - { "theModelName", "32 000,1" } + { "theModelName", "32000,1" } }; var binder = GetBinder(); From 9517e376a23a39f7ee50402fdf596c9f4e3073af Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Thu, 13 Jun 2019 18:33:04 -0700 Subject: [PATCH 2/6] Make the test input a bit more reasonable (#11096) (#11113) 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 3663d85580..e5e9c700cc 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 @@ namespace Microsoft.AspNetCore.Mvc.ModelBinding.Binders var bindingContext = GetBindingContext(destinationType); bindingContext.ValueProvider = new SimpleValueProvider(new CultureInfo("fr-FR")) { - { "theModelName", "32 000,1" } + { "theModelName", "32000,1" } }; var binder = GetBinder(); From 0460bc3ff8590d7eba798d6a377c3a3a607f05c9 Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 14 Jun 2019 12:50:25 -0700 Subject: [PATCH 3/6] Always include ANCM in build output (#11198) --- Directory.Build.targets | 3 +++ .../Microsoft.AspNetCore.AspNetCoreModule.pkgproj | 1 + .../Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj | 1 + 3 files changed, 5 insertions(+) diff --git a/Directory.Build.targets b/Directory.Build.targets index bfb7e9b915..06b3aeb546 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.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj index ef1b44bc18..bfe285f11e 100644 --- a/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj +++ b/src/Servers/IIS/AspNetCoreModuleV1/Microsoft.AspNetCore.AspNetCoreModule/Microsoft.AspNetCore.AspNetCoreModule.pkgproj @@ -11,6 +11,7 @@ true ASP.NET Core Module false + true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj index d78c707d81..866c10bb69 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2/Microsoft.AspNetCore.AspNetCoreModuleV2.pkgproj @@ -11,6 +11,7 @@ true ASP.NET Core Module false + true From f74ca433b42bb48c2b12a83ae5530dc374c5b04f Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Fri, 14 Jun 2019 13:29:00 -0700 Subject: [PATCH 4/6] 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 b0f161d1ed..e1781e0c06 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 29f79f80b0..7117d89f55 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 From 21f6b5f6648138f80639e91b51d4c506c21df7f0 Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Thu, 13 Jun 2019 14:06:17 -0700 Subject: [PATCH 5/6] Update submodules.props for EF 2.2.6 --- build/submodules.props | 2 +- modules/EntityFrameworkCore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/submodules.props b/build/submodules.props index 4370c412c7..a088430493 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -37,6 +37,6 @@ - + diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index f04e9ca9d7..01da710cde 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit f04e9ca9d7a134f5061cb3226a4b0a6c71c285bc +Subproject commit 01da710cdeff0431fc60379580aa63f335fbc165 From d8581565daeafe0205838c6fec4fbf2f42b228ce Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 13 Jun 2019 15:06:21 -0700 Subject: [PATCH 6/6] Fix order in which EF properties are set --- build/dependencies.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 39d1a507a2..ff1b314c33 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,9 +6,6 @@ 2.2.5 - - - 2.2.4 2.2.4 @@ -18,6 +15,9 @@ 2.2.4 + + + $(MicrosoftNETCoreAppPackageVersion)