Skip to content

Commit dd3a0a5

Browse files
brettsambrettsam
committed
update WebJobs; docdb query support
1 parent 823f7c1 commit dd3a0a5

File tree

23 files changed

+283
-216
lines changed

23 files changed

+283
-216
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Extensibility</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10528" />
1818
</dependencies>
1919
</metadata>
2020
</package>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
<Private>True</Private>
4444
</Reference>
4545
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
46+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.1-alpha1-10528\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
50+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.1-alpha1-10528\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Data.Edm, Version=5.8.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net452" />
4-
<package id="Microsoft.Azure.WebJobs" version="2.0.0" targetFramework="net45" />
5-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0" targetFramework="net45" />
4+
<package id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10528" targetFramework="net45" />
5+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.1-alpha1-10528" targetFramework="net45" />
66
<package id="Microsoft.Data.Edm" version="5.8.1" targetFramework="net45" />
77
<package id="Microsoft.Data.OData" version="5.8.1" targetFramework="net45" />
88
<package id="Microsoft.Data.Services.Client" version="5.8.1" targetFramework="net45" />

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.7.2-alpha\lib\net45\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>
7171
<Private>True</Private>
7272
</Reference>
73-
<Reference Include="Microsoft.Azure.Documents.Client">
74-
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.1.11.4\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
73+
<Reference Include="Microsoft.Azure.Documents.Client, Version=1.12.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Microsoft.Azure.DocumentDB.1.12.0\lib\net45\Microsoft.Azure.Documents.Client.dll</HintPath>
7575
<Private>True</Private>
7676
</Reference>
7777
<Reference Include="Microsoft.Azure.KeyVault.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -83,51 +83,51 @@
8383
<Private>True</Private>
8484
</Reference>
8585
<Reference Include="Microsoft.Azure.WebJobs, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
86-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
86+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.1-alpha1-10528\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
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\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
90+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.1-alpha1-10416\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-beta3\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
94+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta3-10416\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.11-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\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
102+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.1-alpha1-10416\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\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
106+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.1-alpha1-10416\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\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.1-alpha1-10416\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\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
114+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.1-alpha1-10416\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\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
118+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.1-alpha1-10416\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">
122-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
122+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.1-alpha1-10528\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">
126126
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta2-10774\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">
130-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
130+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.1-alpha1-10528\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
131131
<Private>True</Private>
132132
</Reference>
133133
<Reference Include="Microsoft.Bot.Connector.DirectLine, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -258,7 +258,7 @@
258258
</PropertyGroup>
259259
<Error Condition="!Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets'))" />
260260
<Error Condition="!Exists('..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets'))" />
261-
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.11.4\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.11.4\build\Microsoft.Azure.DocumentDB.targets'))" />
261+
<Error Condition="!Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets'))" />
262262
</Target>
263263
<Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.21\build\Microsoft.Bcl.Build.targets')" />
264264
<Import Project="..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\..\packages\StyleCop.MSBuild.4.7.54.0\build\StyleCop.MSBuild.Targets')" />
@@ -270,5 +270,5 @@
270270
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.sigdata" DestinationFolder="$(OutputPath)" />
271271
<Copy SourceFiles="..\..\packages\FSharp.Core.4.0.0.1\lib\net40\FSharp.Core.optdata" DestinationFolder="$(OutputPath)" />
272272
</Target>
273-
<Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.11.4\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.11.4\build\Microsoft.Azure.DocumentDB.targets')" />
273+
<Import Project="..\..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets" Condition="Exists('..\..\packages\Microsoft.Azure.DocumentDB.1.12.0\build\Microsoft.Azure.DocumentDB.targets')" />
274274
</Project>

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
77
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net46" />
8-
<package id="Microsoft.Azure.DocumentDB" version="1.11.4" targetFramework="net46" />
8+
<package id="Microsoft.Azure.DocumentDB" version="1.12.0" targetFramework="net46" />
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net46" />
1010
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net46" />
1111
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net46" />
1212
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net46" />
13-
<package id="Microsoft.Azure.WebJobs" version="2.0.0" targetFramework="net46" />
14-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0" targetFramework="net46" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0" targetFramework="net46" />
16-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3" targetFramework="net46" />
13+
<package id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10528" targetFramework="net46" />
14+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.1-alpha1-10528" targetFramework="net46" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10416" targetFramework="net46" />
16+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10416" targetFramework="net46" />
1717
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.11-beta" targetFramework="net46" />
18-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0" targetFramework="net46" />
21-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0" targetFramework="net46" />
18+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10416" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10416" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10416" targetFramework="net46" />
21+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10416" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10416" targetFramework="net46" />
2323
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10774" targetFramework="net46" />
24-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0" targetFramework="net46" />
24+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.1-alpha1-10528" 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" />
2727
<package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net46" />

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0" />
18-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0" />
21-
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10528" />
18+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.1-alpha1-10528" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10416" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10416" />
21+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10416" />
2222
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.11-beta" />
23-
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3" />
24-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0" />
25-
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0" />
26-
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10416" />
24+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10416" />
25+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10416" />
26+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10416" />
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" />

0 commit comments

Comments
 (0)