Skip to content

Commit 111074a

Browse files
committed
Updating the WebJobs.Script nuspec to contain required dependencies
1 parent 6230e3f commit 111074a

File tree

4 files changed

+16
-27
lines changed

4 files changed

+16
-27
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,15 @@
1414
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1515
<tags>Microsoft Azure WebJobs Jobs Script Node.js</tags>
1616
<dependencies>
17-
<dependency id="Microsoft.Azure.WebJobs" version="1.2.0-alpha" />
18-
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.2.0-alpha" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.1.0-alpha" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.1.0-alpha" />
17+
<dependency id="Microsoft.Azure.WebJobs" version="1.2.0-alpha-10305" />
18+
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="1.2.0-alpha-10305" />
19+
<dependency id="Microsoft.Azure.WebJobs.Logging" version="1.2.0-alpha-10305" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="1.1.0-alpha-10279" />
21+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="1.1.0-alpha-10279" />
22+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-alpha-10279" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-alpha-10279" />
24+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-alpha-10279" />
25+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-alpha-10279" />
2126
<dependency id="Edge.js" version="5.9.1" />
2227
</dependencies>
2328
</metadata>

src/WebJobs.Script/Binding/HttpBinding.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,13 @@ public void ProcessResult(IDictionary<string, object> functionArguments, object[
109109
return;
110110
}
111111

112-
HttpRequestMessage request;
113-
114-
if (!functionArguments.TryGetValue(triggerInputName, out request))
112+
HttpRequestMessage request = null;
113+
object argValue = null;
114+
if (functionArguments.TryGetValue(triggerInputName, out argValue) && argValue is HttpRequestMessage)
115+
{
116+
request = (HttpRequestMessage)argValue;
117+
}
118+
else
115119
{
116120
// No argument is bound to the request message, so we should have
117121
// it in the system arguments

src/WebJobs.Script/WebJobs.Script.csproj

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,10 @@
4242
</DocumentationFile>
4343
</PropertyGroup>
4444
<ItemGroup>
45-
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
47-
<Private>True</Private>
48-
</Reference>
49-
<Reference Include="Autofac.Integration.WebApi, Version=3.4.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
5345
<Reference Include="EdgeJs, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5446
<HintPath>..\..\packages\Edge.js.5.9.1\lib\EdgeJs.dll</HintPath>
5547
<Private>True</Private>
5648
</Reference>
57-
<Reference Include="Microsoft.AspNet.WebHooks.Common, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Common.1.2.0-rc1\lib\net45\Microsoft.AspNet.WebHooks.Common.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="Microsoft.AspNet.WebHooks.Receivers, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\Microsoft.AspNet.WebHooks.Receivers.1.2.0-beta6\lib\net45\Microsoft.AspNet.WebHooks.Receivers.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
6549
<Reference Include="Microsoft.Azure.ApiHub.Sdk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
6650
<SpecificVersion>False</SpecificVersion>
6751
<HintPath>..\..\packages\Microsoft.Azure.ApiHub.Sdk.0.6.2\tools\Microsoft.Azure.ApiHub.Sdk.dll</HintPath>

src/WebJobs.Script/packages.config

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="3.5.2" targetFramework="net46" />
4-
<package id="Autofac.WebApi2" version="3.4.0" targetFramework="net45" />
53
<package id="Edge.js" version="5.9.1" targetFramework="net46" />
64
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
75
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
8-
<package id="Microsoft.AspNet.WebHooks.Common" version="1.2.0-rc1" targetFramework="net46" />
9-
<package id="Microsoft.AspNet.WebHooks.Receivers" version="1.2.0-beta6" targetFramework="net46" />
106
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.6.2" targetFramework="net46" />
117
<package id="Microsoft.Azure.DocumentDB" version="1.6.3" targetFramework="net46" />
128
<package id="Microsoft.Azure.Mobile.Client" version="2.0.1" targetFramework="net46" />

0 commit comments

Comments
 (0)