Skip to content

Commit dcc9e1d

Browse files
mathewcmathewc
committed
Consuming new Http binding package
1 parent 0c38f7a commit dcc9e1d

File tree

85 files changed

+167
-1655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+167
-1655
lines changed

‎src/Common/CommonAssemblyInfo.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
1111

1212
[assembly: ComVisible(false)]
13-
[assembly: CLSCompliant(true)]
1413

1514
[assembly: AssemblyVersion("1.0.0.0")]
1615

‎src/WebJobs.Script.Extensibility/GlobalSuppressions.cs‎

244 Bytes
Binary file not shown.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
</dependentAssembly>
8989
<dependentAssembly>
9090
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
91-
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.0.0.0" />
91+
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
9292
</dependentAssembly>
9393
<dependentAssembly>
9494
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@
1010

1111
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "WebJobs.Script.Host.Program.#Main(System.String[])")]
1212
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope", Scope = "member", Target = "Microsoft.Azure.WebJobs.Script.Host.Program.#Main(System.String[])")]
13-
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1636:File header copyright text must match", Justification = "<Pending>")]
13+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("StyleCop.CSharp.DocumentationRules", "SA1636:File header copyright text must match", Justification = "<Pending>")]
14+
[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1014:MarkAssembliesWithClsCompliant")]

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

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -90,36 +90,29 @@
9090
<Private>True</Private>
9191
</Reference>
9292
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
93-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
94-
<Private>True</Private>
93+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
9594
</Reference>
9695
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
97-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta3-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
98-
<Private>True</Private>
96+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta3-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
9997
</Reference>
10098
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
10199
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.13-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
102100
<Private>True</Private>
103101
</Reference>
104102
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
105-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
106-
<Private>True</Private>
103+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
107104
</Reference>
108105
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
109-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
110-
<Private>True</Private>
106+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
111107
</Reference>
112108
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
113-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
114-
<Private>True</Private>
109+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
115110
</Reference>
116111
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
117-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
118-
<Private>True</Private>
112+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
119113
</Reference>
120114
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
121-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.1-alpha1-10427\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
122-
<Private>True</Private>
115+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.0.1-alpha1-10430\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
123116
</Reference>
124117
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
125118
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.0.1-alpha1-10646\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net46" />
1313
<package id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10646" targetFramework="net46" />
1414
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.1-alpha1-10646" targetFramework="net46" />
15-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10427" targetFramework="net46" />
16-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10427" targetFramework="net46" />
15+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10430" targetFramework="net46" />
16+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10430" targetFramework="net46" />
1717
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.13-beta" targetFramework="net46" />
18-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10427" targetFramework="net46" />
19-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10427" targetFramework="net46" />
20-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10427" targetFramework="net46" />
21-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10427" targetFramework="net46" />
22-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10427" targetFramework="net46" />
18+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10430" targetFramework="net46" />
19+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10430" targetFramework="net46" />
20+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10430" targetFramework="net46" />
21+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10430" targetFramework="net46" />
22+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10430" targetFramework="net46" />
2323
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10826" targetFramework="net46" />
2424
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.1-alpha1-10646" targetFramework="net46" />
2525
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net46" />

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
<dependencies>
1717
<dependency id="Microsoft.Azure.WebJobs" version="2.0.1-alpha1-10646" />
1818
<dependency id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.1-alpha1-10646" />
19-
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10427" />
20-
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10427" />
21-
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10427" />
19+
<dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.1-alpha1-10430" />
20+
<dependency id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.1-alpha1-10430" />
21+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.1-alpha1-10430" />
2222
<dependency id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.13-beta" />
23-
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10427" />
24-
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10427" />
25-
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10427" />
26-
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10427" />
23+
<dependency id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta3-10430" />
24+
<dependency id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.1-alpha1-10430" />
25+
<dependency id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.1-alpha1-10430" />
26+
<dependency id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.1-alpha1-10430" />
27+
<dependency id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-alpha1-10430" />
2728
<dependency id="Edge.js" version="6.5.1" />
2829
<dependency id="Microsoft.CodeAnalysis.CSharp.Scripting" version="2.0.0" />
2930
<dependency id="Microsoft.AspNet.WebApi.Core" version="5.2.3" />

‎src/WebJobs.Script.WebHost/Controllers/AdminController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
using System.Threading.Tasks;
1313
using System.Web.Http;
1414
using System.Web.Http.Controllers;
15+
using Microsoft.Azure.WebJobs.Extensions.Http;
1516
using Microsoft.Azure.WebJobs.Host;
16-
using Microsoft.Azure.WebJobs.Host.Config;
1717
using Microsoft.Azure.WebJobs.Script.Config;
1818
using Microsoft.Azure.WebJobs.Script.Description;
1919
using Microsoft.Azure.WebJobs.Script.WebHost.Filters;

‎src/WebJobs.Script.WebHost/Controllers/FunctionsController.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Web.Http;
1111
using System.Web.Http.Controllers;
1212
using System.Web.Http.Dependencies;
13+
using Microsoft.Azure.WebJobs.Extensions.Http;
1314
using Microsoft.Azure.WebJobs.Script.Binding;
1415
using Microsoft.Azure.WebJobs.Script.Description;
1516
using Microsoft.Azure.WebJobs.Script.WebHost.Filters;

‎src/WebJobs.Script.WebHost/Controllers/KeysController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
using System;
55
using System.Collections.Generic;
6-
using System.Diagnostics;
76
using System.Linq;
87
using System.Net;
98
using System.Threading.Tasks;
109
using System.Web.Http;
10+
using Microsoft.Azure.WebJobs.Extensions.Http;
1111
using Microsoft.Azure.WebJobs.Host;
1212
using Microsoft.Azure.WebJobs.Script.WebHost.Filters;
1313
using Microsoft.Azure.WebJobs.Script.WebHost.Models;

0 commit comments

Comments
 (0)