Skip to content

Commit

Permalink
Update runtime to 1.0.11510
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahmelsayed
ahmelsayed committed Jan 29, 2018
1 parent 7646c3c commit b102dde
Show file tree
Hide file tree
Showing 8 changed files with 385 additions and 574 deletions.
432 changes: 98 additions & 334 deletions src/Azure.Functions.Cli/App.config
View file

Large diffs are not rendered by default.

83 changes: 50 additions & 33 deletions src/Azure.Functions.Cli/Azure.Functions.Cli.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Azure.Functions.Cli</RootNamespace>
<AssemblyName>func</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
Expand Down Expand Up @@ -228,59 +229,75 @@
<HintPath>..\..\packages\Microsoft.Azure.NotificationHubs.1.0.7\lib\net45-full\Microsoft.Azure.NotificationHubs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Core.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.2.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta6-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.ApiHub">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.ApiHub.1.0.0-beta6-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.ApiHub.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.BotFramework, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.BotFramework.1.0.15-beta\lib\net46\Microsoft.Azure.WebJobs.Extensions.BotFramework.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.DocumentDB">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.DocumentDB.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.DocumentDB.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta2-10009\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.EventGrid">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.EventGrid.1.0.0-beta3-10015\lib\net46\Microsoft.Azure.WebJobs.Extensions.EventGrid.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Http, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Http">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Http.1.0.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.Http.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.MobileApps">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.MobileApps.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.MobileApps.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.NotificationHubs">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.NotificationHubs.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid, Version=2.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.SendGrid">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.SendGrid.2.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.SendGrid.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta4-10580\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Extensions.Twilio">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Extensions.Twilio.1.1.0-beta4-10582\lib\net45\Microsoft.Azure.WebJobs.Extensions.Twilio.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Host, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Host">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Host.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Logging, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Logging">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Logging.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Logging.ApplicationInsights">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.Logging.ApplicationInsights.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Script, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta3-11469\lib\net451\Microsoft.Azure.WebJobs.Script.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Script">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.1.0.0-beta3-11510\lib\net451\Microsoft.Azure.WebJobs.Script.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Script.Extensibility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.Extensibility.1.0.0-beta3-10955\lib\net45\Microsoft.Azure.WebJobs.Script.Extensibility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.Script.WebHost, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta3-11469\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.Script.WebHost">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.Script.WebHost.1.0.0-beta3-11510\lib\net451\Microsoft.Azure.WebJobs.Script.WebHost.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta4-11129\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
<Reference Include="Microsoft.Azure.WebJobs.ServiceBus">
<HintPath>..\..\packages\Microsoft.Azure.WebJobs.ServiceBus.2.1.0-beta4-11150\lib\net45\Microsoft.Azure.WebJobs.ServiceBus.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.WebSites.DataProtection, Version=0.1.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Azure.WebSites.DataProtection.0.1.81-alpha\lib\net46\Microsoft.Azure.WebSites.DataProtection.dll</HintPath>
Expand Down
19 changes: 13 additions & 6 deletions src/Azure.Functions.Cli/azurefunctions/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function createFunction(f) {
origMetric({ name: name, value: value, properties: properties});
};

context.done = function (err, result) {
context.done = function (err, returnValue) {
if (context._done) {
if (context._promise) {
context.log("Error: Choose either to return a promise or call 'done'. Do not use both in your script.");
Expand All @@ -70,16 +70,23 @@ function createFunction(f) {
callback(err);
}
else {
var values = {};
if (context.res && context.bindings.res === undefined) {
context.bindings.res = context.res;
}

// because Edge.JS interop doesn't flow new values added to objects,
// we capture the binding values and pass them back as part of the
// result
var bindingValues = {};
for (var name in context.bindings) {
values[name] = context.bindings[name];
bindingValues[name] = context.bindings[name];
}
context.bind(values, function (err) {
callback(err, result);
});

var result = {
returnValue: returnValue,
bindingValues: bindingValues
};
callback(null, result);
}
};

Expand Down
Loading

0 comments on commit b102dde

Please sign in to comment.