Skip to content

Commit 9dba881

Browse files
ahmelsayedahmelsayed
committed
Update Host referenced for latest release. This also closes #60 
1 parent 0ba14ba commit 9dba881

File tree

10 files changed

+396
-178
lines changed

10 files changed

+396
-178
lines changed

‎src/Azure.Functions.Cli/App.config

+30
Original file line numberDiff line numberDiff line change
@@ -63,4 +63,34 @@
6363
</dependentAssembly>
6464
</assemblyBinding>
6565
</runtime>
66+
<system.serviceModel>
67+
<extensions>
68+
<!-- In this extension section we are introducing all known service bus extensions. User can remove the ones they don't need. -->
69+
<behaviorExtensions>
70+
<add name="connectionStatusBehavior" type="Microsoft.ServiceBus.Configuration.ConnectionStatusElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
71+
<add name="transportClientEndpointBehavior" type="Microsoft.ServiceBus.Configuration.TransportClientEndpointBehaviorElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
72+
<add name="serviceRegistrySettings" type="Microsoft.ServiceBus.Configuration.ServiceRegistrySettingsElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
73+
</behaviorExtensions>
74+
<bindingElementExtensions>
75+
<add name="netMessagingTransport" type="Microsoft.ServiceBus.Messaging.Configuration.NetMessagingTransportExtensionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
76+
<add name="tcpRelayTransport" type="Microsoft.ServiceBus.Configuration.TcpRelayTransportElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
77+
<add name="httpRelayTransport" type="Microsoft.ServiceBus.Configuration.HttpRelayTransportElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
78+
<add name="httpsRelayTransport" type="Microsoft.ServiceBus.Configuration.HttpsRelayTransportElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
79+
<add name="onewayRelayTransport" type="Microsoft.ServiceBus.Configuration.RelayedOnewayTransportElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
80+
</bindingElementExtensions>
81+
<bindingExtensions>
82+
<add name="basicHttpRelayBinding" type="Microsoft.ServiceBus.Configuration.BasicHttpRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
83+
<add name="webHttpRelayBinding" type="Microsoft.ServiceBus.Configuration.WebHttpRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
84+
<add name="ws2007HttpRelayBinding" type="Microsoft.ServiceBus.Configuration.WS2007HttpRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
85+
<add name="netTcpRelayBinding" type="Microsoft.ServiceBus.Configuration.NetTcpRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
86+
<add name="netOnewayRelayBinding" type="Microsoft.ServiceBus.Configuration.NetOnewayRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
87+
<add name="netEventRelayBinding" type="Microsoft.ServiceBus.Configuration.NetEventRelayBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
88+
<add name="netMessagingBinding" type="Microsoft.ServiceBus.Messaging.Configuration.NetMessagingBindingCollectionElement, Microsoft.ServiceBus, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
89+
</bindingExtensions>
90+
</extensions>
91+
</system.serviceModel>
92+
<appSettings>
93+
<!-- Service Bus specific app setings for messaging connections -->
94+
<add key="Microsoft.ServiceBus.ConnectionString" value="Endpoint=sb://[your namespace].servicebus.windows.net;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=[your secret]" />
95+
</appSettings>
6696
</configuration>

‎src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

+33-55
Large diffs are not rendered by default.

‎src/Azure.Functions.Cli/azurefunctions/functions.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function createFunction(f) {
6565
}
6666
else {
6767
var values = {};
68-
if (context.res) {
68+
if (context.res && context.bindings.res === undefined) {
6969
context.bindings.res = context.res;
7070
}
7171
for (var name in context.bindings) {

‎src/Azure.Functions.Cli/packages.config

+23-22
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Colors.Net" version="1.0.7" targetFramework="net461" />
88
<package id="Edge.js" version="6.5.1" targetFramework="net461" />
99
<package id="FluentCommandLineParser" version="1.4.3" targetFramework="net461" />
10-
<package id="FSharp.Compiler.Service" version="8.0.0" targetFramework="net461" />
10+
<package id="FSharp.Compiler.Service" version="9.0.1" targetFramework="net461" />
1111
<package id="FSharp.Core" version="4.0.0.1" targetFramework="net461" />
1212
<package id="Humanizer" version="1.33.7" targetFramework="net461" />
1313
<package id="Microsoft.AspNet.Cors" version="5.2.3" targetFramework="net461" />
@@ -41,27 +41,27 @@
4141
<package id="Microsoft.AspNetCore.Http.Abstractions" version="1.0.0" targetFramework="net461" />
4242
<package id="Microsoft.AspNetCore.Http.Features" version="1.0.0" targetFramework="net461" />
4343
<package id="Microsoft.AspNetCore.WebUtilities" version="1.0.0" targetFramework="net461" />
44-
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.0-alpha" targetFramework="net461" />
45-
<package id="Microsoft.Azure.DocumentDB" version="1.10.0" targetFramework="net461" />
44+
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net461" />
45+
<package id="Microsoft.Azure.DocumentDB" version="1.11.4" targetFramework="net461" />
4646
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net461" />
47-
<package id="Microsoft.Azure.Mobile.Client" version="3.0.3" targetFramework="net461" />
47+
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net461" />
4848
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net461" />
49-
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.6" targetFramework="net461" />
50-
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta2-10504" targetFramework="net461" />
51-
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta2-10504" targetFramework="net461" />
52-
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10392" targetFramework="net461" />
53-
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10392" targetFramework="net461" />
54-
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.9-beta" targetFramework="net461" />
55-
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10392" targetFramework="net461" />
56-
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10392" targetFramework="net461" />
57-
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10392" targetFramework="net461" />
58-
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10392" targetFramework="net461" />
59-
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10392" targetFramework="net461" />
60-
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-beta2-10504" targetFramework="net461" />
61-
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta2-10726" targetFramework="net461" />
62-
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10726" targetFramework="net461" />
63-
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta2-10726" targetFramework="net461" />
64-
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10504" targetFramework="net461" />
49+
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net461" />
50+
<package id="Microsoft.Azure.WebJobs" version="2.0.0-beta2-10522" targetFramework="net461" />
51+
<package id="Microsoft.Azure.WebJobs.Core" version="2.0.0-beta2-10522" targetFramework="net461" />
52+
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0-beta2-10403" targetFramework="net461" />
53+
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta2-10403" targetFramework="net461" />
54+
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.10-beta" targetFramework="net461" />
55+
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.0.0-beta2-10403" targetFramework="net461" />
56+
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.0.0-beta2-10403" targetFramework="net461" />
57+
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.0.0-beta2-10403" targetFramework="net461" />
58+
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.0.0-beta2-10403" targetFramework="net461" />
59+
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.0.0-beta2-10403" targetFramework="net461" />
60+
<package id="Microsoft.Azure.WebJobs.Logging" version="2.0.0-beta2-10522" targetFramework="net461" />
61+
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta2-10774" targetFramework="net461" />
62+
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta2-10765" targetFramework="net461" />
63+
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta2-10774" targetFramework="net461" />
64+
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.0.0-beta2-10522" targetFramework="net461" />
6565
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.6-alpha45" targetFramework="net461" />
6666
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
6767
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
@@ -86,13 +86,14 @@
8686
<package id="Microsoft.Rest.ClientRuntime" version="2.3.3" targetFramework="net461" />
8787
<package id="Microsoft.Tpl.Dataflow" version="4.5.24" targetFramework="net461" />
8888
<package id="Microsoft.WindowsAzure.ConfigurationManager" version="3.2.3" targetFramework="net461" />
89-
<package id="ncrontab" version="3.2.0" targetFramework="net461" />
89+
<package id="ncrontab" version="3.3.0" targetFramework="net461" />
9090
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
9191
<package id="RestSharp" version="105.2.3" targetFramework="net461" />
9292
<package id="Sendgrid" version="8.0.5" targetFramework="net461" />
9393
<package id="SendGrid.CSharp.HTTP.Client" version="3.0.0" targetFramework="net461" />
9494
<package id="SendGrid.SmtpApi" version="1.3.1" targetFramework="net461" />
9595
<package id="SharpNetSH" version="2.0.5" targetFramework="net461" />
96+
<package id="StyleCop.MSBuild" version="4.7.54.0" targetFramework="net461" developmentDependency="true" />
9697
<package id="System.AppContext" version="4.1.0" targetFramework="net461" />
9798
<package id="System.Buffers" version="4.0.0" targetFramework="net461" />
9899
<package id="System.Collections" version="4.0.11" targetFramework="net461" />
@@ -141,6 +142,6 @@
141142
<package id="System.Xml.XPath" version="4.0.1" targetFramework="net461" />
142143
<package id="System.Xml.XPath.XDocument" version="4.0.1" targetFramework="net461" />
143144
<package id="Twilio" version="4.7.2" targetFramework="net461" />
144-
<package id="WindowsAzure.ServiceBus" version="3.4.1" targetFramework="net461" />
145+
<package id="WindowsAzure.ServiceBus" version="3.4.5" targetFramework="net461" />
145146
<package id="WindowsAzure.Storage" version="7.2.1" targetFramework="net461" />
146147
</packages>

0 commit comments

Comments
 (0)