Skip to content

Commit d74a04f

Browse files
mathewcmathewc
committed
Fix for ServiceBus topic trigger issue (#585)
1 parent 5830f70 commit d74a04f

File tree

16 files changed

+230
-104
lines changed

16 files changed

+230
-104
lines changed

‎WebJobs.Script.sln‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25123.0
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobs.Script", "src\WebJobs.Script\WebJobs.Script.csproj", "{1DC670CD-F42F-4D8F-97BD-0E1AA8221094}"
77
EndProject
@@ -367,6 +367,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HttpTrigger-Node-Promise",
367367
sample\HttpTrigger-Node-Promise\index.js = sample\HttpTrigger-Node-Promise\index.js
368368
EndProjectSection
369369
EndProject
370+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ServiceBusTopicTrigger", "ServiceBusTopicTrigger", "{EE27035A-633D-48AE-BB86-597BBDBA706E}"
371+
ProjectSection(SolutionItems) = preProject
372+
sample\ServiceBusTopicTrigger\function.json = sample\ServiceBusTopicTrigger\function.json
373+
sample\ServiceBusTopicTrigger\index.js = sample\ServiceBusTopicTrigger\index.js
374+
EndProjectSection
375+
EndProject
370376
Global
371377
GlobalSection(SolutionConfigurationPlatforms) = preSolution
372378
Debug|Any CPU = Debug|Any CPU
@@ -464,5 +470,6 @@ Global
464470
{C9FCBCFD-0AD1-44B0-A15B-EE2F5219A345} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
465471
{EB3A602B-4B32-4742-B4A2-39445BD2FBE3} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
466472
{8E4F0ED5-75E0-4D0C-9469-05F738B1EC38} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
473+
{EE27035A-633D-48AE-BB86-597BBDBA706E} = {FF9C0818-30D3-437A-A62D-7A61CA44F459}
467474
EndGlobalSection
468475
EndGlobal

‎sample/ServiceBusTopicTrigger/function.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"bindings": [
3+
{
4+
"type": "serviceBusTrigger",
5+
"name": "message",
6+
"direction": "in",
7+
"topicName": "samples-topic",
8+
"subscriptionName": "samples",
9+
"accessRights": "manage"
10+
},
11+
{
12+
"type": "blob",
13+
"name": "$return",
14+
"direction": "out",
15+
"path": "samples-output/{id}"
16+
}
17+
]
18+
}

‎sample/ServiceBusTopicTrigger/index.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = function (context, message) {
2+
context.log('Node.js ServiceBus topic trigger function processed message', message);
3+
context.done(null, message.value);
4+
}

‎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-beta1-10404" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-beta1-10410" />
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-beta1-10404\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
46+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-beta1-10410\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-beta1-10404\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
50+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-beta1-10410\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
5151
<Private>True</Private>
5252
</Reference>
5353
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.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-beta1-10404" targetFramework="net45" />
5-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta1-10404" targetFramework="net45" />
4+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta1-10410" targetFramework="net45" />
5+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta1-10410" targetFramework="net45" />
66
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net45" />
77
<package id="Microsoft.Data.OData" version="5.7.0" targetFramework="net45" />
88
<package id="Microsoft.Data.Services.Client" version="5.7.0" targetFramework="net45" />

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,47 +83,47 @@
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-beta1-10404\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
86+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.0.0-beta1-10410\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-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
90+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.0-beta1-10368\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-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
94+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
9595
<Private>True</Private>
9696
</Reference>
9797
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
98-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
98+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
9999
<Private>True</Private>
100100
</Reference>
101101
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
102+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
106-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
106+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
107107
<Private>True</Private>
108108
</Reference>
109109
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
110+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
111111
<Private>True</Private>
112112
</Reference>
113113
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta1-10367\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
114+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.0-beta1-10368\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
115115
<Private>True</Private>
116116
</Reference>
117117
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
118-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-beta1-10404\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
118+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.0-beta1-10410\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
119119
<Private>True</Private>
120120
</Reference>
121121
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
122-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta1-10398\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
122+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta1-10457\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
123123
<Private>True</Private>
124124
</Reference>
125125
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-beta1-10404\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
126+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.0.0-beta1-10410\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
127127
<Private>True</Private>
128128
</Reference>
129129
<Reference Include="Microsoft.Data.Edm, Version=5.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@
1010
<package id="Microsoft.Azure.Mobile.Client" version="2.1.1" targetFramework="net46" />
1111
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net46" />
1212
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.5" targetFramework="net46" />
13-
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta1-10404" targetFramework="net46" />
14-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta1-10404" targetFramework="net46" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta1-10367" targetFramework="net46" />
16-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta1-10367" targetFramework="net46" />
17-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta1-10367" targetFramework="net46" />
18-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta1-10367" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta1-10367" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta1-10367" targetFramework="net46" />
21-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta1-10367" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta1-10398" targetFramework="net46" />
23-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta1-10404" targetFramework="net46" />
13+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta1-10410" targetFramework="net46" />
14+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta1-10410" targetFramework="net46" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta1-10368" targetFramework="net46" />
16+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta1-10368" targetFramework="net46" />
17+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta1-10368" targetFramework="net46" />
18+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta1-10368" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta1-10368" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta1-10368" targetFramework="net46" />
21+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta1-10368" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta1-10457" targetFramework="net46" />
23+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta1-10410" targetFramework="net46" />
2424
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />
2525
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net46" />
2626
<package id="Microsoft.Data.Edm" version="5.7.0" targetFramework="net46" />

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
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-beta1-10404" />
18-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta1-10404" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta1-10367" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta1-10367" />
21-
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta1-10367" />
22-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta1-10367" />
23-
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta1-10367" />
24-
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta1-10367" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="2.0.0-beta1-10410" />
18+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta1-10410" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta1-10368" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta1-10368" />
21+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta1-10368" />
22+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta1-10368" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta1-10368" />
24+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta1-10368" />
2525
<dependency id="Edge.js" version="6.5.1" />
2626
<dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="1.3.2" />
2727
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />

0 commit comments

Comments
 (0)