Updating SDK references and bumping version information

fabiocav · fabiocav · commit 7d8c3b2e8182 · 2018-09-10T18:09:33.000-07:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,8 +8,8 @@ branches:
   - core
 
 image:
-- Visual Studio 2017
 - Ubuntu
+- Visual Studio 2017
 
 max_jobs: 1
 
@@ -22,7 +22,7 @@ for:
   - sh: >-
       mkdir .dotnet && 
       chmod +x dotnet-install.sh && 
-      ./dotnet-install.sh --version 2.1.300 --install-dir .dotnet && 
+      ./dotnet-install.sh --version 2.1.400 --install-dir .dotnet && 
       PATH=".dotnet:"$PATH && dotnet --info 
   build_script:
   - sh: dotnet build WebJobs.Script.sln
diff --git a/build/common.props b/build/common.props
@@ -2,13 +2,14 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>7.2</LangVersion>
+    <RuntimeReleaseSuffix>-rc1</RuntimeReleaseSuffix>
     <BuildNumber Condition=" '$(BuildNumber)' == '' ">1</BuildNumber>
     <MajorMinorProductVersion>2.0</MajorMinorProductVersion>
-    <Version>$(MajorMinorProductVersion).0-beta2$(VersionSuffix)</Version>
+    <Version>$(MajorMinorProductVersion).0$(RuntimeReleaseSuffix)$(VersionSuffix)</Version>
     <AssemblyVersion>$(MajorMinorProductVersion).0.0</AssemblyVersion>
     <FileVersion>$(MajorMinorProductVersion).$(BuildNumber).0</FileVersion>
     <CommitHash Condition="$(CommitHash) == ''">N/A</CommitHash>
-    <InformationalVersion>$(FileVersion)-beta1 Commit hash: $(CommitHash)</InformationalVersion>
+    <InformationalVersion>$(FileVersion)$(RuntimeReleaseSuffix) Commit hash: $(CommitHash)</InformationalVersion>
     <Authors>Microsoft</Authors>
     <Company>Microsoft</Company>
     <Product>Azure WebJobs SDK Script Runtime</Product>
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-beta8" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging" Version="3.0.0-beta8" />
+    <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.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.WebHost/WebScriptHostBuilderExtension.cs b/src/WebJobs.Script.WebHost/WebScriptHostBuilderExtension.cs
@@ -26,7 +26,7 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP
                 .AddScriptHost(webHostOptions, configLoggerFactory, webJobsBuilder =>
                 {
                     webJobsBuilder
-                        .AddWebJobsLogging() // Enables WebJobs v1 classic logging
+                        .AddDashboardLogging() // Enables WebJobs v1 classic logging
                         .AddAzureStorageCoreServices();
 
                     configureWebJobs?.Invoke(webJobsBuilder);
diff --git a/src/WebJobs.Script/Binding/WebJobsCoreScriptBindingProvider.cs b/src/WebJobs.Script/Binding/WebJobsCoreScriptBindingProvider.cs
@@ -61,8 +61,7 @@ public override Collection<Attribute> GetAttributes()
 
                 var attribute = new HttpTriggerAttribute(authLevel, methods)
                 {
-                    Route = Context.GetMetadataValue<string>("route"),
-                    WebHookType = Context.GetMetadataValue<string>("webHookType")
+                    Route = Context.GetMetadataValue<string>("route")
                 };
 
                 return new Collection<Attribute> { attribute };
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -33,10 +33,10 @@
     <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-beta8" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.0-beta8" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-beta8" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" Version="3.0.0-beta8" />
+    <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.Build" Version="15.8.166" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="2.8.2" />
     <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.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-beta8" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Http" Version="3.0.0-rc1" />
   </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-beta*"
+                        Version = "3.0.0-rc*"
                     }
                 };
             }
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/ListenerFailureTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/ListenerFailureTests.cs
@@ -57,7 +57,7 @@ public class TestFixture : EndToEndTestFixture
         {
             private const string ScriptRoot = @"TestScripts\ListenerExceptions";
 
-            public TestFixture() : base(ScriptRoot, "node", "Microsoft.Azure.WebJobs.Extensions.EventHubs", "3.0.0-beta6-11300")
+            public TestFixture() : base(ScriptRoot, "node", "Microsoft.Azure.WebJobs.Extensions.EventHubs", "3.0.0-rc*")
             {
             }
 
diff --git a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusEndToEndTestBase.cs b/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusEndToEndTestBase.cs
@@ -88,7 +88,7 @@ public abstract class ServiceBusTestFixture : EndToEndTestFixture
         public string TestTopicName2 = EntityNameHelper.FormatSubscriptionPath("core-test-topic1", "sub2");
         private string connectionString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.ServiceBus);
 
-        protected ServiceBusTestFixture(string rootPath, string testId) : base(rootPath, testId, "Microsoft.Azure.WebJobs.ServiceBus", "3.0.0-beta4-11270")
+        protected ServiceBusTestFixture(string rootPath, string testId) : base(rootPath, testId, "Microsoft.Azure.WebJobs.ServiceBus", "3.0.0-rc*")
         {
         }
 
diff --git a/test/WebJobs.Script.Tests.Integration/Twilio/TwilioEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/Twilio/TwilioEndToEndTestsBase.cs
@@ -37,7 +37,7 @@ await TestHelpers.Await(() =>
         public class TestFixture : EndToEndTestFixture
         {
             public TestFixture() :
-                base(@"TestScripts\CSharp", "csharp", "Microsoft.Azure.WebJobs.Extensions.Twilio", "3.0.0-beta5")
+                base(@"TestScripts\CSharp", "csharp", "Microsoft.Azure.WebJobs.Extensions.Twilio", "3.0.0-rc*")
             {
             }
 
diff --git a/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs b/test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/EndToEndTestFixture.cs
@@ -69,7 +69,7 @@ public async Task InitializeAsync()
             var extensionsToInstall = GetExtensionsToInstall();
             if (extensionsToInstall != null && extensionsToInstall.Length > 0)
             {
-                TestFunctionHost.WriteNugetPackageSources(_copiedRootPath, "http://www.myget.org/F/azure-appservice/api/v2", "https://api.nuget.org/v3/index.json");
+                TestFunctionHost.WriteNugetPackageSources(_copiedRootPath, "http://www.myget.org/F/azure-appservice/api/v2", "https://www.myget.org/F/azure-appservice-staging/api/v2", "https://api.nuget.org/v3/index.json");
                 var options = new OptionsWrapper<ScriptJobHostOptions>(new ScriptJobHostOptions
                 {
                     RootScriptPath = _copiedRootPath
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-beta8" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-rc1" />
     <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/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-beta8" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-rc1" />
     <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
`@@ -26,7 +26,7 @@ public static IHostBuilder AddWebScriptHost(this IHostBuilder builder, IServiceP`
`26`	`26`	`.AddScriptHost(webHostOptions, configLoggerFactory, webJobsBuilder =>`
`27`	`27`	`{`
`28`	`28`	`webJobsBuilder`
`29`		`- .AddWebJobsLogging() // Enables WebJobs v1 classic logging`
	`29`	`+ .AddDashboardLogging() // Enables WebJobs v1 classic logging`
`30`	`30`	`.AddAzureStorageCoreServices();`
`31`	`31`
`32`	`32`	`configureWebJobs?.Invoke(webJobsBuilder);`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ public override Collection<Attribute> GetAttributes()`
`61`	`61`
`62`	`62`	`var attribute = new HttpTriggerAttribute(authLevel, methods)`
`63`	`63`	`{`
`64`		`- Route = Context.GetMetadataValue<string>("route"),`
`65`		`- WebHookType = Context.GetMetadataValue<string>("webHookType")`
	`64`	`+ Route = Context.GetMetadataValue<string>("route")`
`66`	`65`	`};`
`67`	`66`
`68`	`67`	`return new Collection<Attribute> { attribute };`
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-beta*"`
	`70`	`+ Version = "3.0.0-rc*"`
`71`	`71`	`}`
`72`	`72`	`};`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public class TestFixture : EndToEndTestFixture`
`57`	`57`	`{`
`58`	`58`	`private const string ScriptRoot = @"TestScripts\ListenerExceptions";`
`59`	`59`
`60`		`- public TestFixture() : base(ScriptRoot, "node", "Microsoft.Azure.WebJobs.Extensions.EventHubs", "3.0.0-beta6-11300")`
	`60`	`+ public TestFixture() : base(ScriptRoot, "node", "Microsoft.Azure.WebJobs.Extensions.EventHubs", "3.0.0-rc*")`
`61`	`61`	`{`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public abstract class ServiceBusTestFixture : EndToEndTestFixture`
`88`	`88`	`public string TestTopicName2 = EntityNameHelper.FormatSubscriptionPath("core-test-topic1", "sub2");`
`89`	`89`	`private string connectionString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.ServiceBus);`
`90`	`90`
`91`		`- protected ServiceBusTestFixture(string rootPath, string testId) : base(rootPath, testId, "Microsoft.Azure.WebJobs.ServiceBus", "3.0.0-beta4-11270")`
	`91`	`+ protected ServiceBusTestFixture(string rootPath, string testId) : base(rootPath, testId, "Microsoft.Azure.WebJobs.ServiceBus", "3.0.0-rc*")`
`92`	`92`	`{`
`93`	`93`	`}`
`94`	`94`