Merge branch 'upd' into dev

Author: fabiocav

src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj

@@ -45,7 +45,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.4" />
     <PackageReference Include="Microsoft.AspNetCore.Buffering" Version="0.4.0-preview2-28189" />
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.5350001-beta-fc119b98" />
     <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.1.0-a-oob-2-1-oob-17035" />

src/WebJobs.Script/WebJobs.Script.csproj

@@ -25,7 +25,7 @@
     <PackageReference Include="Google.Protobuf" Version="3.5.1" />
     <PackageReference Include="Grpc.Core" Version="1.12.0" />
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.7.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.1">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.2">
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.5350001-beta-fc119b98" />

test/WebJobs.Script.Tests.Shared/TestHelpers.cs

@@ -28,18 +28,6 @@ public static partial class TestHelpers
         private const string Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
         private static readonly Random Random = new Random();
 
-        public static async Task RunWithTimeoutAsync(Func<Task> action, TimeSpan timeout)
-        {
-            Task timeoutTask = Task.Delay(timeout);
-            Task actionTask = action();
-            Task completedTask = await Task.WhenAny(actionTask, timeoutTask);
-
-            if (completedTask == timeoutTask)
-            {
-                throw new Exception($"Task did not complete within timeout interval {timeout}.");
-            }
-        }
-
         /// <summary>
         /// Gets the common root directory that functions tests create temporary directories under.
         /// This enables us to clean up test files by deleting this single directory.
@@ -52,6 +40,18 @@ public static string FunctionsTestDirectory
             }
         }
 
+        public static async Task RunWithTimeoutAsync(Func<Task> action, TimeSpan timeout)
+        {
+            Task timeoutTask = Task.Delay(timeout);
+            Task actionTask = action();
+            Task completedTask = await Task.WhenAny(actionTask, timeoutTask);
+
+            if (completedTask == timeoutTask)
+            {
+                throw new Exception($"Task did not complete within timeout interval {timeout}.");
+            }
+        }
+
         public static byte[] GenerateKeyBytes()
         {
             using (var aes = new AesManaged())