Skip to content

Commit 93e1749

Browse files
mathewcmathewc
committed
Moving to latest extension package versions
1 parent 2ab6f31 commit 93e1749

File tree

12 files changed

+88
-89
lines changed

12 files changed

+88
-89
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,43 +87,43 @@
8787
<Private>True</Private>
8888
</Reference>
8989
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
90-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
90+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
9191
<Private>True</Private>
9292
</Reference>
9393
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
94-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
94+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
9898
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.9-beta\lib\net452\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
102+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
106+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109109
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113113
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
114+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
115115
<Private>True</Private>
116116
</Reference>
117117
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
118-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
118+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
119119
<Private>True</Private>
120120
</Reference>
121121
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
122122
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-beta2-10504\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
123123
<Private>True</Private>
124124
</Reference>
125125
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta2-10723\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
126+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta2-10726\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
127127
<Private>True</Private>
128128
</Reference>
129129
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.6" targetFramework="net46" />
1313
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta2-10504" targetFramework="net46" />
1414
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta2-10504" targetFramework="net46" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10392" targetFramework="net46" />
16-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10392" targetFramework="net46" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10396" targetFramework="net46" />
16+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10396" targetFramework="net46" />
1717
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.9-beta" targetFramework="net46" />
18-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10392" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10392" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10392" targetFramework="net46" />
21-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10392" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10392" targetFramework="net46" />
23-
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10723" targetFramework="net46" />
18+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10396" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10396" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10396" targetFramework="net46" />
21+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10396" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10396" targetFramework="net46" />
23+
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net46" />
2424
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10504" targetFramework="net46" />
2525
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
2626
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
<dependencies>
1717
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-beta2-10504" />
1818
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10504" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10392" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10392" />
21-
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10392" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10396" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10396" />
21+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10396" />
2222
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.9-beta" />
23-
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10392" />
24-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10392" />
25-
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10392" />
26-
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10392" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10396" />
24+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10396" />
25+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10396" />
26+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10396" />
2727
<dependency id="Edge.js" version="6.5.1" />
2828
<dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="1.3.2" />
2929
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,35 +175,35 @@
175175
<Private>True</Private>
176176
</Reference>
177177
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
178-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
178+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
179179
<Private>True</Private>
180180
</Reference>
181181
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
182-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
182+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
183183
<Private>True</Private>
184184
</Reference>
185185
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
186186
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.9-beta\lib\net452\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
187187
<Private>True</Private>
188188
</Reference>
189189
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
190-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
190+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
191191
<Private>True</Private>
192192
</Reference>
193193
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
194-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
194+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
195195
<Private>True</Private>
196196
</Reference>
197197
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
198-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
198+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
199199
<Private>True</Private>
200200
</Reference>
201201
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
202-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
202+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
203203
<Private>True</Private>
204204
</Reference>
205205
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
206-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta2-10392\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
206+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta2-10396\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
207207
<Private>True</Private>
208208
</Reference>
209209
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -215,7 +215,7 @@
215215
<Private>True</Private>
216216
</Reference>
217217
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
218-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta2-10723\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
218+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta2-10726\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
219219
<Private>True</Private>
220220
</Reference>
221221
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@
3838
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.6" targetFramework="net46" />
3939
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta2-10504" targetFramework="net46" />
4040
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta2-10504" targetFramework="net46" />
41-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10392" targetFramework="net46" />
42-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10392" targetFramework="net46" />
41+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10396" targetFramework="net46" />
42+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10396" targetFramework="net46" />
4343
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.9-beta" targetFramework="net46" />
44-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10392" targetFramework="net46" />
45-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10392" targetFramework="net46" />
46-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10392" targetFramework="net46" />
47-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10392" targetFramework="net46" />
48-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10392" targetFramework="net46" />
44+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10396" targetFramework="net46" />
45+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10396" targetFramework="net46" />
46+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10396" targetFramework="net46" />
47+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10396" targetFramework="net46" />
48+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10396" targetFramework="net46" />
4949
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-beta2-10504" targetFramework="net46" />
50-
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10723" targetFramework="net46" />
50+
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net46" />
5151
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10504" targetFramework="net46" />
5252
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha45" targetFramework="net46" />
5353
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,8 +1017,7 @@ private void OnUnhandledException(object sender, UnhandledExceptionEventArgs e)
10171017

10181018
private void HandleHostError(Microsoft.Azure.WebJobs.Extensions.TraceFilter traceFilter)
10191019
{
1020-
// TODO: figure out why sometimes we get null events
1021-
var events = traceFilter.Events.Where(p => p != null).ToArray();
1020+
var events = traceFilter.GetEvents().Where(p => p != null).ToArray();
10221021

10231022
foreach (TraceEvent traceEvent in events)
10241023
{

0 commit comments

Comments
 (0)