Skip to content

Commit

Permalink
Upgrade runtime to 11184, and cli to 1.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ahmelsayed committed Sep 8, 2017
1 parent a920cf6 commit 7232b01
Show file tree
Hide file tree
Showing 11 changed files with 182 additions and 171 deletions.
20 changes: 9 additions & 11 deletions src/Azure.Functions.Cli/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<!--Explicitly redirecting back to 4.0.0. See https://github.com/dotnet/corefx/issues/15693 for details-->
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All @@ -153,43 +153,43 @@
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<!--Explicitly redirecting back to 4.0.0. See https://github.com/dotnet/corefx/issues/16805 for details-->
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-4.9.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.1.0" newVersion="1.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyInjection.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.ApplicationInsights" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AI.Agent.Intercept" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.0.7.0" newVersion="2.0.7.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AI.DependencyCollector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AI.PerfCounterCollector" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AI.WindowsServer" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.1.0" newVersion="2.4.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.AI.ServerTelemetryChannel" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.3.0.0" newVersion="2.3.0.0" />
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
Expand Down Expand Up @@ -228,7 +228,5 @@
</extensions>
</system.serviceModel>
<appSettings>
<!-- Service Bus specific app setings for messaging connections -->
<add key="Microsoft.ServiceBus.ConnectionString" value="Endpoint=sb://[your namespace].servicebus.windows.net;SharedAccessKeyName=RootManageSharedAccessKey;SharedAccessKey=[your secret]" />
</appSettings>
</configuration>
100 changes: 48 additions & 52 deletions src/Azure.Functions.Cli/Azure.Functions.Cli.csproj

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Azure.Functions.Cli/Common/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ internal static class Constants
public const string FunctionsStorageAccountNamePrefix = "AzureFunctions";
public const string StorageAccountArmType = "Microsoft.Storage/storageAccounts";
public const string FunctionAppArmKind = "functionapp";
public const string CliVersion = "1.0.2";
public const string CliVersion = "1.0.3";
public const string CliDebug = "CLI_DEBUG";
public const string DefaultSqlProviderName = "System.Data.SqlClient";
public const string WebsiteHostname = "WEBSITE_HOSTNAME";
Expand Down
12 changes: 9 additions & 3 deletions src/Azure.Functions.Cli/azurefunctions/functions.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ function createFunction(f) {
});
context.log = log;

var origMetric = context._metric;
delete context._metric;
context.log.metric = function (name, value, properties) {
origMetric({ name: name, value: value, properties: properties});
};

context.done = function (err, result) {
if (context._done) {
if (context._promise) {
Expand Down Expand Up @@ -83,7 +89,7 @@ function createFunction(f) {

var lowercaseTrigger = context._triggerType && context._triggerType.toLowerCase();
switch (lowercaseTrigger) {
case "httptrigger":
case "httptrigger":
context.req = request(context);
context.res = response(context);
break;
Expand Down Expand Up @@ -121,8 +127,8 @@ function getEntryPoint(f, context) {

if (!util.isFunction(f)) {
throw "Unable to determine function entry point. If multiple functions are exported, " +
"you must indicate the entry point, either by naming it 'run' or 'index', or by naming it " +
"explicitly via the 'entryPoint' metadata property.";
"you must indicate the entry point, either by naming it 'run' or 'index', or by naming it " +
"explicitly via the 'entryPoint' metadata property.";
}

return f;
Expand Down
2 changes: 1 addition & 1 deletion src/Azure.Functions.Cli/npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azure-functions-core-tools",
"version": "1.0.2",
"version": "1.0.3",
"description": "Azure Functions Core Tools",
"scripts": {
"postinstall": "node lib/install.js"
Expand Down
51 changes: 26 additions & 25 deletions src/Azure.Functions.Cli/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<package id="Autofac" version="4.2.1" targetFramework="net461" />
<package id="Autofac.WebApi2" version="4.0.1" targetFramework="net461" />
<package id="Colors.Net" version="1.0.7" targetFramework="net461" />
<package id="Edge.js" version="6.5.1" targetFramework="net461" />
<package id="Edge.js" version="6.11.3" targetFramework="net461" />
<package id="FluentCommandLineParser" version="1.4.3" targetFramework="net461" />
<package id="FSharp.Compiler.Service" version="9.0.1" targetFramework="net461" />
<package id="FSharp.Core" version="4.0.0.1" targetFramework="net461" />
<package id="Humanizer" version="1.33.7" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights" version="2.3.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.0.7" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.3.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.PerfCounterCollector" version="2.3.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.WindowsServer" version="2.3.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.3.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights" version="2.4.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.Agent.Intercept" version="2.4.0" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.DependencyCollector" version="2.4.1" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.PerfCounterCollector" version="2.4.1" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.WindowsServer" version="2.4.1" targetFramework="net461" />
<package id="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" version="2.4.0" targetFramework="net461" />
<package id="Microsoft.AspNet.Cors" version="5.2.3" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net461" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net461" />
Expand Down Expand Up @@ -48,31 +48,32 @@
<package id="Microsoft.AspNetCore.Http.Features" version="1.0.2" targetFramework="net461" />
<package id="Microsoft.AspNetCore.WebUtilities" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.Azure.ApiHub.Sdk" version="0.7.2-alpha" targetFramework="net461" />
<package id="Microsoft.Azure.AppService.Proxy.Client.Contract" version="0.3.0.6" targetFramework="net461" />
<package id="Microsoft.Azure.DocumentDB" version="1.13.2" targetFramework="net461" />
<package id="Microsoft.Azure.DocumentDB.ChangeFeedProcessor" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net461" />
<package id="Microsoft.Azure.Mobile.Client" version="3.1.0" targetFramework="net461" />
<package id="Microsoft.Azure.NotificationHubs" version="1.0.7" targetFramework="net461" />
<package id="Microsoft.Azure.ServiceBus.EventProcessorHost" version="2.2.10" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-10950" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-10950" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs" version="2.1.0-beta1-11013" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Core" version="2.1.0-beta1-11013" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions" version="2.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.ApiHub" version="1.0.0-beta4-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.BotFramework" version="1.0.15-beta" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-beta1-10002" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10467" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging" version="2.1.0-beta1-10947" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-10950" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta3-11075" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.DocumentDB" version="1.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.EventGrid" version="1.0.0-beta1-10007" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Http" version="1.0.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.MobileApps" version="1.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.NotificationHubs" version="1.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.SendGrid" version="2.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Extensions.Twilio" version="1.1.0-beta1-10524" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging" version="2.1.0-beta1-11013" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Logging.ApplicationInsights" version="2.1.0-beta1-11013" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script" version="1.0.0-beta3-11184" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.Extensibility" version="1.0.0-beta3-10955" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta3-11075" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-10950" targetFramework="net461" />
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.79-alpha" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.Script.WebHost" version="1.0.0-beta3-11184" targetFramework="net461" />
<package id="Microsoft.Azure.WebJobs.ServiceBus" version="2.1.0-beta1-11013" targetFramework="net461" />
<package id="Microsoft.Azure.WebSites.DataProtection" version="0.1.81-alpha" targetFramework="net461" />
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net461" />
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net461" />
<package id="Microsoft.Bot.Connector.DirectLine" version="3.0.0-beta" targetFramework="net461" />
Expand Down Expand Up @@ -120,7 +121,7 @@
<package id="System.ComponentModel" version="4.3.0" targetFramework="net461" />
<package id="System.Console" version="4.3.0" targetFramework="net461" />
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.4.0" targetFramework="net461" />
<package id="System.Diagnostics.FileVersionInfo" version="4.3.0" targetFramework="net461" />
<package id="System.Diagnostics.StackTrace" version="4.3.0" targetFramework="net461" />
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net461" />
Expand Down
13 changes: 12 additions & 1 deletion test/Azure.Functions.Cli.Tests/ApplicationInsights.config
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<Add>core.chinacloudapi.cn</Add>
<Add>core.cloudapi.de</Add>
<Add>core.usgovcloudapi.net</Add>
<Add>localhost</Add>
<Add>127.0.0.1</Add>
</ExcludeComponentCorrelationHttpHeadersOnDomains>
</Add>
<Add Type="Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.PerformanceCollectorModule, Microsoft.AI.PerfCounterCollector">
Expand All @@ -43,12 +45,21 @@
<Add Type="Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryModule, Microsoft.AI.PerfCounterCollector"/>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.DeveloperModeWithDebuggerAttachedTelemetryModule, Microsoft.AI.WindowsServer"/>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.UnhandledExceptionTelemetryModule, Microsoft.AI.WindowsServer"/>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.UnobservedExceptionTelemetryModule, Microsoft.AI.WindowsServer"/>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.UnobservedExceptionTelemetryModule, Microsoft.AI.WindowsServer">
<!--</Add>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.FirstChanceExceptionStatisticsTelemetryModule, Microsoft.AI.WindowsServer">-->
</Add>
</TelemetryModules>
<TelemetryProcessors>
<Add Type="Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.QuickPulse.QuickPulseTelemetryProcessor, Microsoft.AI.PerfCounterCollector"/>
<Add Type="Microsoft.ApplicationInsights.Extensibility.AutocollectedMetricsExtractor, Microsoft.ApplicationInsights"/>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
<MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
<ExcludedTypes>Event</ExcludedTypes>
</Add>
<Add Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.AdaptiveSamplingTelemetryProcessor, Microsoft.AI.ServerTelemetryChannel">
<MaxTelemetryItemsPerSecond>5</MaxTelemetryItemsPerSecond>
<IncludedTypes>Event</IncludedTypes>
</Add>
</TelemetryProcessors>
<TelemetryChannel Type="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.ServerTelemetryChannel, Microsoft.AI.ServerTelemetryChannel"/>
Expand Down
Loading

0 comments on commit 7232b01

Please sign in to comment.