Skip to content

Commit b102dde

Browse files
ahmelsayedahmelsayed
committed
Update runtime to 1.0.11510
1 parent 7646c3c commit b102dde

File tree

8 files changed

+385
-574
lines changed

8 files changed

+385
-574
lines changed

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

+98-334
Large diffs are not rendered by default.

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

+50-33
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Azure.Functions.Cli</RootNamespace>
1212
<AssemblyName>func</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
1616
<NuGetPackageImportStamp>
1717
</NuGetPackageImportStamp>
18+
<TargetFrameworkProfile />
1819
</PropertyGroup>
1920
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2021
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -228,59 +229,75 @@
228229
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
229230
<Private>True</Private>
230231
</Reference>
231-
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
232-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
232+
<Reference Include="Microsoft.Azure.WebJobs">
233+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
234+
<Private>True</Private>
233235
</Reference>
234-
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
235-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
236+
<Reference Include="Microsoft.Azure.WebJobs.Extensions">
237+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
238+
<Private>True</Private>
236239
</Reference>
237-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
238-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta6-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
240+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub">
241+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta6-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
242+
<Private>True</Private>
239243
</Reference>
240244
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
241245
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
242246
</Reference>
243-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
244-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
247+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB">
248+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
249+
<Private>True</Private>
245250
</Reference>
246-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
247-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta2-10009\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
251+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid">
252+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10015\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
253+
<Private>True</Private>
248254
</Reference>
249-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
250-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
255+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Http">
256+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
257+
<Private>True</Private>
251258
</Reference>
252-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
253-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
259+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps">
260+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
261+
<Private>True</Private>
254262
</Reference>
255-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
256-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
263+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs">
264+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
265+
<Private>True</Private>
257266
</Reference>
258-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
259-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
267+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid">
268+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
269+
<Private>True</Private>
260270
</Reference>
261-
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
262-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
271+
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio">
272+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
273+
<Private>True</Private>
263274
</Reference>
264-
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
265-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
275+
<Reference Include="Microsoft.Azure.WebJobs.Host">
276+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
277+
<Private>True</Private>
266278
</Reference>
267-
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
268-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
279+
<Reference Include="Microsoft.Azure.WebJobs.Logging">
280+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
281+
<Private>True</Private>
269282
</Reference>
270-
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
271-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
283+
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights">
284+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
285+
<Private>True</Private>
272286
</Reference>
273-
<Reference Include="Microsoft.Azure.WebJobs.Script, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
274-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta3-11469\lib\net451\Microsoft.Azure.WebJobs.Script.dll</HintPath>
287+
<Reference Include="Microsoft.Azure.WebJobs.Script">
288+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta3-11510\lib\net451\Microsoft.Azure.WebJobs.Script.dll</HintPath>
289+
<Private>True</Private>
275290
</Reference>
276291
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
277292
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta3-10955\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
278293
</Reference>
279-
<Reference Include="Microsoft.Azure.WebJobs.Script.WebHost, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
280-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta3-11469\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
294+
<Reference Include="Microsoft.Azure.WebJobs.Script.WebHost">
295+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta3-11510\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
296+
<Private>True</Private>
281297
</Reference>
282-
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
283-
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
298+
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus">
299+
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
300+
<Private>True</Private>
284301
</Reference>
285302
<Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
286303
<HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.81-alpha\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>

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

+13-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function createFunction(f) {
5555
origMetric({ name: name, value: value, properties: properties});
5656
};
5757

58-
context.done = function (err, result) {
58+
context.done = function (err, returnValue) {
5959
if (context._done) {
6060
if (context._promise) {
6161
context.log("Error: Choose either to return a promise or call 'done'. Do not use both in your script.");
@@ -70,16 +70,23 @@ function createFunction(f) {
7070
callback(err);
7171
}
7272
else {
73-
var values = {};
7473
if (context.res && context.bindings.res === undefined) {
7574
context.bindings.res = context.res;
7675
}
76+
77+
// because Edge.JS interop doesn't flow new values added to objects,
78+
// we capture the binding values and pass them back as part of the
79+
// result
80+
var bindingValues = {};
7781
for (var name in context.bindings) {
78-
values[name] = context.bindings[name];
82+
bindingValues[name] = context.bindings[name];
7983
}
80-
context.bind(values, function (err) {
81-
callback(err, result);
82-
});
84+
85+
var result = {
86+
returnValue: returnValue,
87+
bindingValues: bindingValues
88+
};
89+
callback(null, result);
8390
}
8491
};
8592

0 commit comments

Comments
 (0)