Skip to content

Commit d5985ad

Browse files
mathewcmathewc
committed
Moving to latest WebJobs SDK prerelease version
1 parent 72fb7e0 commit d5985ad

File tree

19 files changed

+77
-136
lines changed

19 files changed

+77
-136
lines changed

‎sample/host.json‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
{
22
"id": "5a709861cab44e68bfed5d2c2fe7fc0c",
3-
"queues": {
4-
"maxPollingInterval": 2000
5-
},
6-
"tracing": {
7-
"consoleLevel": "Verbose"
8-
},
9-
"singleton": {
10-
"listenerLockPeriod": "00:00:15"
11-
},
123
"webhooks": {
134
"port": 46001
145
}

‎src/WebJobs.Script.Host/App.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,14 @@
2222
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
2323
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
2424
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
28+
</dependentAssembly>
29+
<dependentAssembly>
30+
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
32+
</dependentAssembly>
2533
</assemblyBinding>
2634
</runtime>
2735
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup></configuration>

‎src/WebJobs.Script.Host/WebJobs.Script.Host.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,27 @@
6767
<Private>True</Private>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.WebJobs, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
70+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
73+
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.1-alpha-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
77-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.0\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
77+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
78+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.1-alpha-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="Microsoft.Azure.WebJobs.Extensions.WebHooks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
82-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.WebHooks.1.0.0-beta3\lib\net45\Microsoft.Azure.WebJobs.Extensions.WebHooks.dll</HintPath>
82+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.WebHooks.1.0.0-beta3-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.WebHooks.dll</HintPath>
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
86+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
90-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
90+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
9191
<Private>True</Private>
9292
</Reference>
9393
<Reference Include="Microsoft.Data.Edm, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/WebJobs.Script.Host/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
99
<package id="Microsoft.AspNet.WebHooks.Common" version="1.2.0-beta4" targetFramework="net45" />
1010
<package id="Microsoft.AspNet.WebHooks.Receivers" version="1.2.0-beta4" targetFramework="net45" />
11-
<package id="Microsoft.Azure.WebJobs" version="1.1.1-alpha-10193" targetFramework="net45" />
12-
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.1-alpha-10193" targetFramework="net45" />
13-
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.0" targetFramework="net45" />
14-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.0" targetFramework="net45" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions.WebHooks" version="1.0.0-beta3" targetFramework="net45" />
16-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.1-alpha-10193" targetFramework="net45" />
11+
<package id="Microsoft.Azure.WebJobs" version="1.1.1-alpha-10195" targetFramework="net45" />
12+
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.1-alpha-10195" targetFramework="net45" />
13+
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.1-alpha-10210" targetFramework="net45" />
14+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.1-alpha-10210" targetFramework="net45" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions.WebHooks" version="1.0.0-beta3-10210" targetFramework="net45" />
16+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.1-alpha-10195" targetFramework="net45" />
1717
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
1818
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
1919
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />

‎src/WebJobs.Script.NuGet/WebJobs.Script.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
<dependencies>
1717
<dependency id="Microsoft.Azure.WebJobs" version="1.1.0-alpha" />
1818
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.0-alpha" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.0.0" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.0" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.0.1-alpha" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.1-alpha" />
2121
<dependency id="Microsoft.Azure.WebJobs.Extensions.WebHooks" version="1.0.0-beta3" />
2222
</dependencies>
2323
</metadata>

‎src/WebJobs.Script/Config/ScriptHost.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ protected virtual void Initialize()
3636
new NodeFunctionDescriptorProvider(HostConfig, ScriptConfig.RootPath)
3737
};
3838

39+
if (HostConfig.IsDevelopment)
40+
{
41+
HostConfig.UseDevelopmentSettings();
42+
}
43+
3944
// read host.json and apply to JobHostConfiguration
4045
string hostConfigFilePath = Path.Combine(ScriptConfig.RootPath, "host.json");
4146
Console.WriteLine(string.Format("Reading host configuration file '{0}'", hostConfigFilePath));

‎src/WebJobs.Script/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("0.0.1.0")]
36-
[assembly: AssemblyFileVersion("0.0.1.0")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]
3737

3838
[assembly: InternalsVisibleTo("WebJobs.Script.Tests")]

‎src/WebJobs.Script/WebJobs.Script.csproj‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,40 +55,40 @@
5555
<HintPath>..\..\packages\FsPickler.1.2.5\lib\net45\FsPickler.dll</HintPath>
5656
<Private>True</Private>
5757
</Reference>
58-
<Reference Include="Microsoft.Azure.WebJobs, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
58+
<Reference Include="Microsoft.AspNet.WebHooks.Common, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Common.1.2.0-beta4\lib\net45\Microsoft.AspNet.WebHooks.Common.dll</HintPath>
6060
<Private>True</Private>
6161
</Reference>
62-
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
62+
<Reference Include="Microsoft.AspNet.WebHooks.Receivers, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Receivers.1.2.0-beta4\lib\net45\Microsoft.AspNet.WebHooks.Receivers.dll</HintPath>
6464
<Private>True</Private>
6565
</Reference>
66-
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.1-alpha-10193\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
66+
<Reference Include="Microsoft.Azure.WebJobs, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
6868
<Private>True</Private>
6969
</Reference>
70-
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
70+
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.1-alpha-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
7272
<Private>True</Private>
7373
</Reference>
74-
<Reference Include="Microsoft.AspNet.WebHooks.Common, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Common.1.2.0-beta3a\lib\net45\Microsoft.AspNet.WebHooks.Common.dll</HintPath>
74+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
75+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.1-alpha-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
7676
<Private>True</Private>
7777
</Reference>
78-
<Reference Include="Microsoft.AspNet.WebHooks.Receivers, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Receivers.1.2.0-beta3a\lib\net45\Microsoft.AspNet.WebHooks.Receivers.dll</HintPath>
78+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.WebHooks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
79+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.WebHooks.1.0.0-beta3-10210\lib\net45\Microsoft.Azure.WebJobs.Extensions.WebHooks.dll</HintPath>
8080
<Private>True</Private>
8181
</Reference>
82-
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.0-rc1\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
82+
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
8484
<Private>True</Private>
8585
</Reference>
86-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
87-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.0-rc1\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
86+
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.1-alpha-10195\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
8888
<Private>True</Private>
8989
</Reference>
90-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.WebHooks, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.WebHooks.1.0.0-beta2\lib\net45\Microsoft.Azure.WebJobs.Extensions.WebHooks.dll</HintPath>
90+
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
91+
<HintPath>..\..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
9292
<Private>True</Private>
9393
</Reference>
9494
<Reference Include="Microsoft.Data.Edm, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/WebJobs.Script/packages.config‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
<package id="FsPickler" version="1.2.5" targetFramework="net45" />
88
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
99
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
10-
<package id="Microsoft.AspNet.WebHooks.Common" version="1.2.0-beta3a" targetFramework="net45" />
11-
<package id="Microsoft.AspNet.WebHooks.Receivers" version="1.2.0-beta3a" targetFramework="net45" />
12-
<package id="Microsoft.Azure.WebJobs" version="1.1.1-alpha-10193" targetFramework="net45" />
13-
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.1-alpha-10193" targetFramework="net45" />
14-
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.0-rc1" targetFramework="net45" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.0-rc1" targetFramework="net45" />
16-
<package id="Microsoft.Azure.WebJobs.Extensions.WebHooks" version="1.0.0-beta2" targetFramework="net45" />
17-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.1-alpha-10193" targetFramework="net45" />
10+
<package id="Microsoft.AspNet.WebHooks.Common" version="1.2.0-beta4" targetFramework="net45" />
11+
<package id="Microsoft.AspNet.WebHooks.Receivers" version="1.2.0-beta4" targetFramework="net45" />
12+
<package id="Microsoft.Azure.WebJobs" version="1.1.1-alpha-10195" targetFramework="net45" />
13+
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.1-alpha-10195" targetFramework="net45" />
14+
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.1-alpha-10210" targetFramework="net45" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.1-alpha-10210" targetFramework="net45" />
16+
<package id="Microsoft.Azure.WebJobs.Extensions.WebHooks" version="1.0.0-beta3-10210" targetFramework="net45" />
17+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.1-alpha-10195" targetFramework="net45" />
1818
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
1919
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
2020
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />

‎test/WebJobs.Script.Tests/TestScripts/Bash/host.json‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,3 @@
11
{
2-
"id": "b18103439bb04828a9f1e1ab578df12a",
3-
"queues": {
4-
"maxPollingInterval": 2000
5-
},
6-
"tracing": {
7-
"consoleLevel": "Verbose"
8-
},
9-
"singleton": {
10-
"listenerLockPeriod": "00:00:15"
11-
}
2+
"id": "b18103439bb04828a9f1e1ab578df12a"
123
}

0 commit comments

Comments
 (0)