From de5310e886d360baac460a5094db1a67c44a1784 Mon Sep 17 00:00:00 2001
From: John Luo <johluo@microsoft.com>
Date: Mon, 18 Mar 2019 14:49:15 -0700
Subject: [PATCH 1/2] Update build tools (#8528)

* update build tools' aka KoreBuild aka Internal SDK versions
* update EF submodule
* fix submodule builds with trimming
  - path must not contain trailing slashes apparently
* bump Microsoft.NETFramework.ReferenceAssemblies package version to align with KoreBuild
---
 build/RepositoryBuild.targets | 2 +-
 build/dependencies.props      | 4 ++--
 global.json                   | 2 +-
 korebuild-lock.txt            | 4 ++--
 modules/EntityFrameworkCore   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index ee91e3a2ca..265150d565 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -129,7 +129,7 @@
     <Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
 
     <Exec
-      Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot) $(BuildArguments)"
+      Command="./$(_BuildScriptToExecute) -Path $(BuildRepositoryRoot.TrimEnd('\')) $(BuildArguments)"
       IgnoreStandardErrorWarningFormat="true"
       WorkingDirectory="$(RepositoryRoot)"
       IgnoreExitCode="true"
diff --git a/build/dependencies.props b/build/dependencies.props
index cfe9644e75..6bd81edf5a 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -32,7 +32,7 @@
     <MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>$(KoreBuildVersion)</MicrosoftAspNetCoreBuildToolsApiCheckPackageVersion>
     <InternalAspNetCoreSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSdkPackageVersion>
     <InternalAspNetCoreSiteExtensionSdkPackageVersion>$(KoreBuildVersion)</InternalAspNetCoreSiteExtensionSdkPackageVersion>
-    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190110.1</InternalAspNetCoreSdkPackageVersion>
+    <InternalAspNetCoreSdkPackageVersion Condition=" '$(KoreBuildVersion)' == '' ">2.2.1-build-20190318.1</InternalAspNetCoreSdkPackageVersion>
   </PropertyGroup>
 
   <!-- These are package versions that should not be overridden or updated by automation. -->
@@ -173,7 +173,7 @@
     <MicrosoftNETCoreApp21PackageVersion>2.1.3</MicrosoftNETCoreApp21PackageVersion>
     <MicrosoftNETCoreDotNetAppHost21PackageVersion>$(MicrosoftNETCoreApp21PackageVersion)</MicrosoftNETCoreDotNetAppHost21PackageVersion>
     <MicrosoftNETCoreWindowsApiSetsPackageVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsPackageVersion>
-    <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
+    <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-5</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
     <MicrosoftOwinSecurityCookiesPackageVersion>3.0.1</MicrosoftOwinSecurityCookiesPackageVersion>
     <MicrosoftOwinSecurityPackageVersion>3.0.1</MicrosoftOwinSecurityPackageVersion>
diff --git a/global.json b/global.json
index f2958a2808..b7ba160d3f 100644
--- a/global.json
+++ b/global.json
@@ -3,6 +3,6 @@
         "version": "2.2.102"
     },
     "msbuild-sdks": {
-        "Internal.AspNetCore.Sdk": "2.2.1-build-20190117.2"
+        "Internal.AspNetCore.Sdk": "2.2.1-build-20190318.1"
     }
 }
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
index 3ac9e66dcc..046ff6d26a 100644
--- a/korebuild-lock.txt
+++ b/korebuild-lock.txt
@@ -1,2 +1,2 @@
-version:2.2.1-build-20190117.2
-commithash:66f8343ddf482908dd82005dd2154c9e2776e2a1
+version:2.2.1-build-20190318.1
+commithash:530ec9c3c7892073cd179a0ad7242d9398efd8e8
diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore
index bf24028cec..d1b10fc6cc 160000
--- a/modules/EntityFrameworkCore
+++ b/modules/EntityFrameworkCore
@@ -1 +1 @@
-Subproject commit bf24028cec2e5f63c02307865729f3c1b3afcf38
+Subproject commit d1b10fc6ccca83e29109a0a8d9c047f2e68aede5

From 2b80b9fa0118647fb4eac6636d912f5b312e8540 Mon Sep 17 00:00:00 2001
From: Stephen Halter <halter73@gmail.com>
Date: Thu, 28 Mar 2019 11:42:45 -0700
Subject: [PATCH 2/2] Attempt to make MaxRequestBufferSizeTests.LargeUpload
 less flaky (#8582)

This is for the release/2.1 branch, but should probably be ported forward to master so the test can be unskipped.

Fixes https://github.com/aspnet/AspNetCore-Internal/issues/1775 (hopefully)
See https://github.com/aspnet/AspNetCore-Internal/issues/1970 for the master version.
---
 .../test/FunctionalTests/MaxRequestBufferSizeTests.cs        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
index 64522f2202..4161eba5d5 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/MaxRequestBufferSizeTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
@@ -20,7 +20,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
 {
     public class MaxRequestBufferSizeTests : LoggedTest
     {
-        private const int _dataLength = 20 * 1024 * 1024;
+        private const int _dataLength = 100 * 1024 * 1024;
 
         private static readonly string[] _requestLines = new[]
         {
@@ -277,6 +277,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
                     }
 
                     options.Limits.MinRequestBodyDataRate = null;
+                    options.Limits.MaxRequestBodySize = _dataLength;
                 })
                 .UseContentRoot(Directory.GetCurrentDirectory())
                 .Configure(app => app.Run(async context =>