Skip to content

Commit 707446e

Browse files
mathewcmathewc
committed
Moving to latest WebJobs SDK prerelease version
1 parent 6a1934b commit 707446e

File tree

14 files changed

+169
-153
lines changed

14 files changed

+169
-153
lines changed

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
6+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
88
</dependentAssembly>
99
<dependentAssembly>
10-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
11-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
10+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
11+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
1212
</dependentAssembly>
1313
<dependentAssembly>
14-
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-4.0.20511.1437" newVersion="4.0.20511.1437"/>
14+
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
15+
<bindingRedirect oldVersion="0.0.0.0-4.0.20511.1437" newVersion="4.0.20511.1437" />
1616
</dependentAssembly>
1717
<dependentAssembly>
18-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
19-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
18+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
19+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
2020
</dependentAssembly>
2121
<dependentAssembly>
22-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
23-
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
22+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
2424
</dependentAssembly>
2525
<dependentAssembly>
26-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
27-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0"/>
26+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
2828
</dependentAssembly>
2929
<dependentAssembly>
30-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
31-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0"/>
30+
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
31+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
3232
</dependentAssembly>
3333
</assemblyBinding>
3434
</runtime>
35-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/></startup></configuration>
35+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>

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

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,23 +59,23 @@
5959
<Private>True</Private>
6060
</Reference>
6161
<Reference Include="Microsoft.Azure.WebJobs, Version=1.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.2-alpha-10229\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
62+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.1.1.2-alpha-10251\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
6363
<Private>True</Private>
6464
</Reference>
65-
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
66-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.1\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
65+
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
66+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.1.0.2-alpha-10232\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
70-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.1\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.1.0.2-alpha-10232\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
7373
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=1.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.2-alpha-10229\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
74+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.1.1.2-alpha-10251\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=1.1.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
78-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.2-alpha-10229\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
78+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.1.1.2-alpha-10251\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
7979
<Private>True</Private>
8080
</Reference>
8181
<Reference Include="Microsoft.Data.Edm, Version=5.6.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -106,16 +106,20 @@
106106
<HintPath>..\..\packages\ncrontab.2.0.0\lib\net20\NCrontab.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
109+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
110+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
111+
<Private>True</Private>
112+
</Reference>
113+
<Reference Include="SendGrid, Version=6.3.4.0, Culture=neutral, PublicKeyToken=4f047e93159395ca, processorArchitecture=MSIL">
114+
<HintPath>..\..\packages\Sendgrid.6.3.4\lib\SendGrid.dll</HintPath>
111115
<Private>True</Private>
112116
</Reference>
113117
<Reference Include="SendGrid.SmtpApi, Version=1.3.1.0, Culture=neutral, PublicKeyToken=2ae73662c35d80e4, processorArchitecture=MSIL">
114118
<HintPath>..\..\packages\SendGrid.SmtpApi.1.3.1\lib\net40\SendGrid.SmtpApi.dll</HintPath>
115119
<Private>True</Private>
116120
</Reference>
117-
<Reference Include="SendGridMail, Version=6.1.0.0, Culture=neutral, PublicKeyToken=2ae73662c35d80e4, processorArchitecture=MSIL">
118-
<HintPath>..\..\packages\Sendgrid.6.1.0\lib\SendGridMail.dll</HintPath>
121+
<Reference Include="SendGridMail, Version=6.3.4.0, Culture=neutral, PublicKeyToken=4f047e93159395ca, processorArchitecture=MSIL">
122+
<HintPath>..\..\packages\Sendgrid.6.3.4\lib\SendGridMail.dll</HintPath>
119123
<Private>True</Private>
120124
</Reference>
121125
<Reference Include="System" />

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebHooks.Common" version="1.2.0-beta4" targetFramework="net45" />
88
<package id="Microsoft.AspNet.WebHooks.Receivers" version="1.2.0-beta4" targetFramework="net45" />
9-
<package id="Microsoft.Azure.WebJobs" version="1.1.2-alpha-10229" targetFramework="net45" />
10-
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.2-alpha-10229" targetFramework="net45" />
11-
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.1" targetFramework="net45" />
12-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.1" targetFramework="net45" />
13-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.2-alpha-10229" targetFramework="net45" />
9+
<package id="Microsoft.Azure.WebJobs" version="1.1.2-alpha-10251" targetFramework="net46" />
10+
<package id="Microsoft.Azure.WebJobs.Core" version="1.1.2-alpha-10251" targetFramework="net46" />
11+
<package id="Microsoft.Azure.WebJobs.Extensions" version="1.0.2-alpha-10232" targetFramework="net46" />
12+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.2-alpha-10232" targetFramework="net46" />
13+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.2-alpha-10251" targetFramework="net46" />
1414
<package id="Microsoft.Data.Edm" version="5.6.2" targetFramework="net45" />
1515
<package id="Microsoft.Data.OData" version="5.6.2" targetFramework="net45" />
1616
<package id="Microsoft.Data.Services.Client" version="5.6.2" targetFramework="net45" />
1717
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net45" />
1818
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
1919
<package id="ncrontab" version="2.0.0" targetFramework="net45" />
20-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
21-
<package id="Sendgrid" version="6.1.0" targetFramework="net45" />
20+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net46" />
21+
<package id="Sendgrid" version="6.3.4" targetFramework="net46" />
2222
<package id="SendGrid.SmtpApi" version="1.3.1" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.2" targetFramework="net45" />
2424
<package id="WindowsAzure.ServiceBus" version="2.7.6" targetFramework="net45" />

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="1.1.0-alpha" />
18-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.0-alpha" />
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" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="1.1.2-alpha" />
18+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.1.2-alpha" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.0.2-alpha" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.0.2-alpha" />
2121
</dependencies>
2222
</metadata>
2323
</package>

‎src/WebJobs.Script.WebHost/Web.config‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<!--
33
For more information on how to configure your ASP.NET application, please visit
44
http://go.microsoft.com/fwlink/?LinkId=301879
@@ -13,62 +13,62 @@
1313
</system.Web>
1414
-->
1515
<system.web>
16-
<compilation debug="true" targetFramework="4.6"/>
17-
<httpRuntime targetFramework="4.5"/>
16+
<compilation debug="true" targetFramework="4.6" />
17+
<httpRuntime targetFramework="4.5" />
1818
</system.web>
1919
<system.webServer>
2020
<handlers>
21-
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
22-
<remove name="OPTIONSVerbHandler"/>
23-
<remove name="TRACEVerbHandler"/>
24-
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
21+
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
22+
<remove name="OPTIONSVerbHandler" />
23+
<remove name="TRACEVerbHandler" />
24+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
2525
</handlers>
26-
<validation validateIntegratedModeConfiguration="false"/>
26+
<validation validateIntegratedModeConfiguration="false" />
2727
</system.webServer>
2828
<runtime>
2929
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
3030
<dependentAssembly>
31-
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
32-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
31+
<assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
32+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
3333
</dependentAssembly>
3434
<dependentAssembly>
35-
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
36-
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
35+
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
36+
<bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
3737
</dependentAssembly>
3838
<dependentAssembly>
39-
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
40-
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
39+
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
40+
<bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
4141
</dependentAssembly>
4242
<dependentAssembly>
43-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
44-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
43+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
44+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
4545
</dependentAssembly>
4646
<dependentAssembly>
47-
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
48-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
47+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
48+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
4949
</dependentAssembly>
5050
<dependentAssembly>
51-
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
52-
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0"/>
51+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
52+
<bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
5353
</dependentAssembly>
5454
<dependentAssembly>
55-
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
56-
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0"/>
55+
<assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
56+
<bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
5757
</dependentAssembly>
5858
<dependentAssembly>
59-
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
60-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0"/>
59+
<assemblyIdentity name="Microsoft.Azure.WebJobs.Host" publicKeyToken="31bf3856ad364e35" culture="neutral" />
60+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
6161
</dependentAssembly>
6262
<dependentAssembly>
63-
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
64-
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0"/>
63+
<assemblyIdentity name="Microsoft.Azure.WebJobs" publicKeyToken="31bf3856ad364e35" culture="neutral" />
64+
<bindingRedirect oldVersion="0.0.0.0-1.1.2.0" newVersion="1.1.2.0" />
6565
</dependentAssembly>
6666
</assemblyBinding>
6767
</runtime>
6868
<system.codedom>
6969
<compilers>
70-
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701"/>
71-
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
70+
<compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:6 /nowarn:1659;1699;1701" />
71+
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:14 /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
7272
</compilers>
7373
</system.codedom>
7474
</configuration>

0 commit comments

Comments
 (0)