Updating SDK and extension references

fabiocav · fabiocav · commit ac5b9d19deb8 · 2018-09-17T17:07:09.000-07:00
diff --git a/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj b/src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj
@@ -49,8 +49,8 @@
     <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" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.0-rc1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Host.Storage" Version="3.0.0-11458" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-11458" />
     <PackageReference Include="Microsoft.Azure.WebSites.DataProtection" Version="2.1.88-alpha" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.1" />
diff --git a/src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs b/src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs
@@ -16,22 +16,22 @@
 namespace Microsoft.Azure.WebJobs.Script.DependencyInjection
 {
     /// <summary>
-    /// An implementation of an <see cref="IWebJobsStartupTypeDiscoverer"/> that locates startup types
+    /// An implementation of an <see cref="IWebJobsStartupTypeLocator"/> that locates startup types
     /// from extension registrations.
     /// </summary>
-    public class ScriptStartupTypeDiscoverer : IWebJobsStartupTypeDiscoverer
+    public class ScriptStartupTypeLocator : IWebJobsStartupTypeLocator
     {
         private readonly string _rootScriptPath;
         private readonly ILogger _logger;
 
         private static string[] _builtinExtensionAssemblies = GetBuiltinExtensionAssemblies();
 
-        public ScriptStartupTypeDiscoverer(string rootScriptPath)
+        public ScriptStartupTypeLocator(string rootScriptPath)
             : this(rootScriptPath, NullLogger.Instance)
         {
         }
 
-        public ScriptStartupTypeDiscoverer(string rootScriptPath, ILogger logger)
+        public ScriptStartupTypeLocator(string rootScriptPath, ILogger logger)
         {
             _rootScriptPath = rootScriptPath ?? throw new ArgumentNullException(nameof(rootScriptPath));
             _logger = logger;
diff --git a/src/WebJobs.Script/ScriptHostBuilderExtensions.cs b/src/WebJobs.Script/ScriptHostBuilderExtensions.cs
@@ -169,7 +169,7 @@ public static void AddCommonServices(IServiceCollection services)
 
         public static IWebJobsBuilder UseScriptExternalStartup(this IWebJobsBuilder builder, string rootScriptPath)
         {
-            return builder.UseExternalStartup(new ScriptStartupTypeDiscoverer(rootScriptPath));
+            return builder.UseExternalStartup(new ScriptStartupTypeLocator(rootScriptPath));
         }
 
         public static IHostBuilder SetAzureFunctionsEnvironment(this IHostBuilder builder)
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -31,17 +31,16 @@
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.5350001-beta-fc119b98" />
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.1.1-beta03" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta4-10082" />
-    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-rc1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-rc1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-rc1" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.0-11458" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-10683" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-10683" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.0-11458" />
     <PackageReference Include="Microsoft.Build" Version="15.8.166" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.8.2" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.1.1" />
-    <PackageReference Include="ncrontab" Version="3.3.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NuGet.Frameworks" Version="4.7.0" />
     <PackageReference Include="NuGet.LibraryModel" Version="4.7.0" />
diff --git a/test/TestFunctions/TestFunctions.csproj b/test/TestFunctions/TestFunctions.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-10683" />
   </ItemGroup>
 
 </Project>
diff --git a/test/WebJobs.Script.Tests.Integration/EventHubs/EventHubsEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/EventHubs/EventHubsEndToEndTestsBase.cs
@@ -67,7 +67,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()
                     new ExtensionPackageReference
                     {
                         Id = "Microsoft.Azure.WebJobs.Extensions.EventHubs",
-                        Version = "3.0.0-rc1"
+                        Version = "3.0.0-11458"
                     }
                 };
             }
diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestsBase.cs
@@ -12,6 +12,7 @@
 using Microsoft.Azure.WebJobs.Host;
 using Microsoft.Azure.WebJobs.Logging;
 using Microsoft.Azure.WebJobs.Script.Config;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Microsoft.WindowsAzure.MobileServices;
 using Microsoft.WindowsAzure.Storage.Blob;
@@ -26,11 +27,16 @@ namespace Microsoft.Azure.WebJobs.Script.Tests
     public abstract class EndToEndTestsBase<TTestFixture> :
         IClassFixture<TTestFixture> where TTestFixture : EndToEndTestFixture, new()
     {
-        private INameResolver _nameResolver = new DefaultNameResolver();
+        private INameResolver _nameResolver;
         private static readonly ScriptSettingsManager SettingsManager = ScriptSettingsManager.Instance;
 
         public EndToEndTestsBase(TTestFixture fixture)
         {
+            var config = new ConfigurationBuilder()
+                .AddEnvironmentVariables()
+                .Build();
+
+            _nameResolver = new DefaultNameResolver(config);
             Fixture = fixture;
         }
 
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Microsoft.Azure.DocumentDB.Core" Version="1.9.1" />
     <PackageReference Include="Microsoft.Azure.EventHubs" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta4-10082" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-11458" />
     <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.1.1-beta03" />
     <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/ScriptStartupTypeDiscovererTests.cs b/test/WebJobs.Script.Tests/ScriptStartupTypeDiscovererTests.cs
@@ -51,7 +51,7 @@ void CopyToBin(string path)
                 File.WriteAllText(Path.Combine(binPath, "extensions.json"), extensions.ToString());
 
                 var testLogger = new TestLogger("test");
-                var discoverer = new ScriptStartupTypeDiscoverer(directory.Path, testLogger);
+                var discoverer = new ScriptStartupTypeLocator(directory.Path, testLogger);
 
                 // Act
                 var types = discoverer.GetExtensionsStartupTypes();
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -44,7 +44,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="3.0.0-rc1" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-11458" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="2.1.0.227">
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.0" />

Original file line number	Diff line number	Diff line change
`@@ -16,22 +16,22 @@`
`16`	`16`	`namespace Microsoft.Azure.WebJobs.Script.DependencyInjection`
`17`	`17`	`{`
`18`	`18`	`/// <summary>`
`19`		`- /// An implementation of an <see cref="IWebJobsStartupTypeDiscoverer"/> that locates startup types`
	`19`	`+ /// An implementation of an <see cref="IWebJobsStartupTypeLocator"/> that locates startup types`
`20`	`20`	`/// from extension registrations.`
`21`	`21`	`/// </summary>`
`22`		`- public class ScriptStartupTypeDiscoverer : IWebJobsStartupTypeDiscoverer`
	`22`	`+ public class ScriptStartupTypeLocator : IWebJobsStartupTypeLocator`
`23`	`23`	`{`
`24`	`24`	`private readonly string _rootScriptPath;`
`25`	`25`	`private readonly ILogger _logger;`
`26`	`26`
`27`	`27`	`private static string[] _builtinExtensionAssemblies = GetBuiltinExtensionAssemblies();`
`28`	`28`
`29`		`- public ScriptStartupTypeDiscoverer(string rootScriptPath)`
	`29`	`+ public ScriptStartupTypeLocator(string rootScriptPath)`
`30`	`30`	`: this(rootScriptPath, NullLogger.Instance)`
`31`	`31`	`{`
`32`	`32`	`}`
`33`	`33`
`34`		`- public ScriptStartupTypeDiscoverer(string rootScriptPath, ILogger logger)`
	`34`	`+ public ScriptStartupTypeLocator(string rootScriptPath, ILogger logger)`
`35`	`35`	`{`
`36`	`36`	`_rootScriptPath = rootScriptPath ?? throw new ArgumentNullException(nameof(rootScriptPath));`
`37`	`37`	`_logger = logger;`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@ public static void AddCommonServices(IServiceCollection services)`
`169`	`169`
`170`	`170`	`public static IWebJobsBuilder UseScriptExternalStartup(this IWebJobsBuilder builder, string rootScriptPath)`
`171`	`171`	`{`
`172`		`- return builder.UseExternalStartup(new ScriptStartupTypeDiscoverer(rootScriptPath));`
	`172`	`+ return builder.UseExternalStartup(new ScriptStartupTypeLocator(rootScriptPath));`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`public static IHostBuilder SetAzureFunctionsEnvironment(this IHostBuilder builder)`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected override ExtensionPackageReference[] GetExtensionsToInstall()`
`67`	`67`	`new ExtensionPackageReference`
`68`	`68`	`{`
`69`	`69`	`Id = "Microsoft.Azure.WebJobs.Extensions.EventHubs",`
`70`		`- Version = "3.0.0-rc1"`
	`70`	`+ Version = "3.0.0-11458"`
`71`	`71`	`}`
`72`	`72`	`};`
`73`	`73`	`}`