Merge branch 'rel/2.0.0-preview1' into dev

This commit is contained in:
BrennanConroy 2017-05-02 13:41:42 -07:00
commit e55bce2db3
2 changed files with 7 additions and 2 deletions

View File

@ -4,6 +4,7 @@
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.ApplicationInsights.Extensibility;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
@ -28,7 +29,7 @@ namespace IISSample
var logger = loggerFactory.CreateLogger("Requests");
app.UseMvcWithDefaultRoute();
app.Map("/log", logApp => logApp.Run(async (context) =>
app.Map("/log", logApp => logApp.Run((context) =>
{
TelemetryConfiguration.Active.TelemetryChannel = new CurrentResponseTelemetryChannel(context.Response);
@ -53,6 +54,8 @@ namespace IISSample
specificLogger.LogWarning("Specific warning log");
TelemetryConfiguration.Active.TelemetryChannel = null;
return Task.FromResult(true);
}));
app.Run(async (context) =>
{

View File

@ -13,9 +13,11 @@
<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="$(AppInsightsVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Hosting" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.AspNetCore.Razor.Runtime" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="$(AspNetCoreVersion)" />
<PackageReference Include="Microsoft.Extensions.DiagnosticAdapter" Version="$(AspNetCoreVersion)" />
</ItemGroup>
</Project>