updating WebJobs nugets to 3.0.18 (#6175)

brettsam · web-flow · commit efb460d0e324 · 2020-06-05T12:50:02.000-07:00
* updating WebJobs nugets to 3.0.18 (#6170) * updating WebJobs nugets to 3.0.18 * also bumping extensions, http, cosmos refs * one more * bumping docdb ref in tests
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -57,10 +57,10 @@
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.8100001-0126c21e" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.0.3" />
     <PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="4.0.0" />    
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18-11733" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="4.0.1" />    
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18" />
     <PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="4.0.1" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.91-alpha" />
     <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.3" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -41,10 +41,10 @@
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.2.2" />
     <PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="2.0.281" />
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18-11733" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.6" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.17" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="4.0.1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.7" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.18" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Script.Abstractions" Version="1.0.0-preview" />
     <PackageReference Include="Microsoft.Build" Version="15.8.166" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="3.5.0" />
diff --git a/test/TestFunctions/TestFunctions.csproj b/test/TestFunctions/TestFunctions.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.6-dev637091948071476258" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.7" />
   </ItemGroup>
 
 </Project>
diff --git a/test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/CosmosDB/CosmosDBEndToEndTestsBase.cs
@@ -6,10 +6,10 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Documents;
 using Microsoft.Azure.Documents.Client;
+using Microsoft.Azure.Storage.Queue;
 using Microsoft.Azure.WebJobs.Script.Models;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Azure.Storage.Queue;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.CosmosDB
@@ -97,7 +97,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()
                     new ExtensionPackageReference
                     {
                         Id = "Microsoft.Azure.WebJobs.Extensions.CosmosDB",
-                        Version = "3.0.4"
+                        Version = "3.0.8"
                     }
             };
         }
diff --git a/test/WebJobs.Script.Tests.Integration/Storage/StorageEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/Storage/StorageEndToEndTests.cs
@@ -1,13 +1,11 @@
 ﻿using System;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Azure.Storage.Queue;
 using Microsoft.Azure.WebJobs.Script.Models;
 using Microsoft.Azure.WebJobs.Script.Workers.Rpc;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Azure.Storage.Queue;
 using Xunit;
-using System.Text;
-using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Storage
 {
@@ -23,7 +21,7 @@ public StorageEndToEndTests(StorageTestFixture fixture)
         [Fact]
         public async Task QueueTriggerToBlobRich()
         {
-            _fixture.AssertNoScriptHostErrors();               
+            _fixture.AssertNoScriptHostErrors();
 
             string id = Guid.NewGuid().ToString();
             string messageContent = string.Format("{{ \"id\": \"{0}\" }}", id);
@@ -50,7 +48,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()
                     new ExtensionPackageReference
                     {
                         Id = "Microsoft.Azure.WebJobs.Extensions.Storage",
-                        Version = "4.0.0-dev637091944077950638"
+                        Version = "4.0.2"
                     }
                 };
             }
@@ -144,5 +142,5 @@ public override void ConfigureScriptHost(IWebJobsBuilder webJobsBuilder)
                 });
             }
         }
-    }  
+    }
 }
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -36,10 +36,10 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="2.10.0" />
     <PackageReference Include="Microsoft.Azure.EventHubs" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.2.2" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.0-dev637091944077950638" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.2" />
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.6.0" />
     <PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.0.2" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.1.0" />
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -55,7 +55,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="Moq" Version="4.9.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.0-beta004" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.0-dev637091944077950638" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.2" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="2.1.0.227">
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.0" />
diff --git a/test/WebJobsStartupTests/WebJobsStartupTests.csproj b/test/WebJobsStartupTests/WebJobsStartupTests.csproj
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18-11733" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.18" />
     <PackageReference Include="Microsoft.Net.Sdk.Functions" Version="1.0.*" />
   </ItemGroup>
 

Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,10 @@`
`6`	`6`	`using System.Threading.Tasks;`
`7`	`7`	`using Microsoft.Azure.Documents;`
`8`	`8`	`using Microsoft.Azure.Documents.Client;`
	`9`	`+using Microsoft.Azure.Storage.Queue;`
`9`	`10`	`using Microsoft.Azure.WebJobs.Script.Models;`
`10`	`11`	`using Microsoft.Extensions.Configuration;`
`11`	`12`	`using Microsoft.Extensions.DependencyInjection;`
`12`		`-using Microsoft.Azure.Storage.Queue;`
`13`	`13`	`using Xunit;`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.WebJobs.Script.Tests.CosmosDB`
`@@ -97,7 +97,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()`
`97`	`97`	`new ExtensionPackageReference`
`98`	`98`	`{`
`99`	`99`	`Id = "Microsoft.Azure.WebJobs.Extensions.CosmosDB",`
`100`		`- Version = "3.0.4"`
	`100`	`+ Version = "3.0.8"`
`101`	`101`	`}`
`102`	`102`	`};`
`103`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Threading.Tasks;`
	`4`	`+using Microsoft.Azure.Storage.Queue;`
`4`	`5`	`using Microsoft.Azure.WebJobs.Script.Models;`
`5`	`6`	`using Microsoft.Azure.WebJobs.Script.Workers.Rpc;`
`6`	`7`	`using Microsoft.Extensions.DependencyInjection;`
`7`		`-using Microsoft.Azure.Storage.Queue;`
`8`	`8`	`using Xunit;`
`9`		`-using System.Text;`
`10`		`-using Microsoft.Azure.WebJobs.Script.Description;`
`11`	`9`
`12`	`10`	`namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Storage`
`13`	`11`	`{`
`@@ -23,7 +21,7 @@ public StorageEndToEndTests(StorageTestFixture fixture)`
`23`	`21`	`[Fact]`
`24`	`22`	`public async Task QueueTriggerToBlobRich()`
`25`	`23`	`{`
`26`		`- _fixture.AssertNoScriptHostErrors();`
	`24`	`+ _fixture.AssertNoScriptHostErrors();`
`27`	`25`
`28`	`26`	`string id = Guid.NewGuid().ToString();`
`29`	`27`	`string messageContent = string.Format("{{ \"id\": \"{0}\" }}", id);`
`@@ -50,7 +48,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()`
`50`	`48`	`new ExtensionPackageReference`
`51`	`49`	`{`
`52`	`50`	`Id = "Microsoft.Azure.WebJobs.Extensions.Storage",`
`53`		`- Version = "4.0.0-dev637091944077950638"`
	`51`	`+ Version = "4.0.2"`
`54`	`52`	`}`
`55`	`53`	`};`
`56`	`54`	`}`
`@@ -144,5 +142,5 @@ public override void ConfigureScriptHost(IWebJobsBuilder webJobsBuilder)`
`144`	`142`	`});`
`145`	`143`	`}`
`146`	`144`	`}`
`147`		`- }`
	`145`	`+ }`
`148`	`146`	`}`