Skip to content
This repository was archived by the owner on Jun 10, 2020. It is now read-only.

Commit ef3eee5

Browse files
upendrasupendras
committed
Merge pull request #119 from Microsoft/upendras/rc1
Changes for rc1
2 parents ba5f480 + 41a4d4f commit ef3eee5

File tree

21 files changed

+189
-169
lines changed

21 files changed

+189
-169
lines changed

‎keys/35MSSharedLib1024.snk‎

160 Bytes
Binary file not shown.

‎src/Microsoft.ApplicationInsights.AspNet/Extensions/ApplicationInsightsExtensions.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Microsoft.Framework.DependencyInjection
1+
namespace Microsoft.Extensions.DependencyInjection
22
{
33
using System;
44
using System.Collections.Generic;
@@ -11,8 +11,8 @@
1111
using Microsoft.ApplicationInsights.DataContracts;
1212
using Microsoft.ApplicationInsights.Extensibility;
1313
using Microsoft.AspNet.Builder;
14-
using Microsoft.Framework.Configuration;
15-
using Microsoft.Framework.Configuration.Memory;
14+
using Microsoft.Extensions.Configuration;
15+
using Microsoft.Extensions.Configuration.Memory;
1616

1717
public static class ApplicationInsightsExtensions
1818
{

‎src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/OperationNameTelemetryInitializer.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace Microsoft.ApplicationInsights.AspNet.TelemetryInitializers
22
{
33
using System;
4+
using System.Diagnostics;
45
using System.Diagnostics.Tracing;
56
using System.Linq;
67

@@ -12,14 +13,14 @@
1213
using Microsoft.AspNet.Mvc.Abstractions;
1314
using Microsoft.AspNet.Mvc.Routing;
1415
using Microsoft.AspNet.Routing;
15-
using Microsoft.Framework.DependencyInjection;
16-
using Microsoft.Framework.TelemetryAdapter;
16+
using Microsoft.Extensions.DependencyInjection;
17+
using Microsoft.Extensions.DiagnosticAdapter;
1718

1819
public class OperationNameTelemetryInitializer : TelemetryInitializerBase
1920
{
2021
public const string BeforeActionNotificationName = "Microsoft.AspNet.Mvc.BeforeAction";
2122

22-
public OperationNameTelemetryInitializer(IHttpContextAccessor httpContextAccessor, TelemetryListener telemetryListener)
23+
public OperationNameTelemetryInitializer(IHttpContextAccessor httpContextAccessor, DiagnosticListener telemetryListener)
2324
: base(httpContextAccessor)
2425
{
2526
if (telemetryListener == null)
@@ -56,7 +57,7 @@ protected override void OnInitializeTelemetry(HttpContext platformContext, Reque
5657
}
5758
}
5859

59-
[TelemetryName(BeforeActionNotificationName)]
60+
[DiagnosticName(BeforeActionNotificationName)]
6061
public void OnBeforeAction(ActionDescriptor actionDescriptor, HttpContext httpContext, RouteData routeData)
6162
{
6263
string name = this.GetNameFromRouteContext(routeData);

‎src/Microsoft.ApplicationInsights.AspNet/TelemetryInitializers/TelemetryInitializerBase.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
using Microsoft.ApplicationInsights.Extensibility;
99
using Microsoft.AspNet.Hosting;
1010
using Microsoft.AspNet.Http;
11-
using Microsoft.Framework.DependencyInjection;
11+
using Microsoft.Extensions.DependencyInjection;
1212

1313
public abstract class TelemetryInitializerBase : ITelemetryInitializer
1414
{

‎src/Microsoft.ApplicationInsights.AspNet/project.json‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,27 @@
1-
{
1+
{
22
"title": "Application Insights for ASP.NET 5 Web Applications",
33
"description": "Application Insights for ASP.NET 5 web applications. See http://go.microsoft.com/fwlink/?LinkID=510752 for more information.",
44
"authors": [ "Microsoft" ],
5-
"version": "1.0.0-beta8-*",
5+
"version": "1.0.0-rc1-*",
66
"copyright": "Copyright © Microsoft. All Rights Reserved.",
77
"projectUrl": "https://github.com/Microsoft/ApplicationInsights-aspnet5",
88
"licenseUrl": "http://go.microsoft.com/fwlink/?LinkID=510709",
99
"requireLicenseAcceptance": true,
1010
"iconUrl": "http://appanacdn.blob.core.windows.net/cdn/icons/aic.png",
1111
"tags": [ "Analytics", "ApplicationInsights", "Telemetry", "AppInsights", "ASP.NET 5" ],
12+
"compilationOptions": {
13+
"keyFile": "../../keys/35MSSharedLib1024.snk",
14+
"delaySign": true
15+
},
1216
"dependencies": {
1317
"Microsoft.ApplicationInsights": "1.1.1-beta",
14-
"Microsoft.AspNet.Hosting.Abstractions": "1.0.0-beta8-*",
15-
"Microsoft.AspNet.Http.Abstractions": "1.0.0-beta8-*",
16-
"Microsoft.AspNet.Http.Features": "1.0.0-beta8-*",
17-
"Microsoft.AspNet.Mvc": "6.0.0-beta8-*",
18-
"Microsoft.Framework.Logging.Abstractions": "1.0.0-beta8-*",
19-
"Microsoft.Framework.Configuration": "1.0.0-beta8-*",
20-
"Microsoft.Framework.TelemetryAdapter": "1.0.0-beta8-*"
18+
"Microsoft.AspNet.Hosting.Abstractions": "1.0.0-rc1-*",
19+
"Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-*",
20+
"Microsoft.AspNet.Http.Features": "1.0.0-rc1-*",
21+
"Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
22+
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc1-*",
23+
"Microsoft.Extensions.Configuration": "1.0.0-rc1-*",
24+
"Microsoft.Extensions.DiagnosticAdapter": "1.0.0-rc1-*"
2125
},
2226

2327
"frameworks": {

‎test/EmptyApp.FunctionalTests/Startup.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
using System.Threading.Tasks;
55
using Microsoft.AspNet.Builder;
66
using Microsoft.AspNet.Http;
7-
using Microsoft.Framework.DependencyInjection;
7+
using Microsoft.Extensions.DependencyInjection;
88
using Microsoft.ApplicationInsights.AspNet.Extensions;
9-
using Microsoft.Framework.Configuration;
10-
using Microsoft.Framework.Configuration.Memory;
9+
using Microsoft.Extensions.Configuration;
10+
using Microsoft.Extensions.Configuration.Memory;
1111
using Microsoft.ApplicationInsights.Channel;
1212
using FunctionalTestUtils;
1313
using Microsoft.ApplicationInsights;

‎test/EmptyApp.FunctionalTests/project.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"webroot": "wwwroot",
33
"version": "1.0.0-*",
4-
4+
"compilationOptions": {
5+
"keyFile": "../../keys/35MSSharedLib1024.snk",
6+
"delaySign": true
7+
},
58
"dependencies": {
6-
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta8-*",
7-
"Microsoft.ApplicationInsights.AspNet": "1.0.0-beta8-*",
8-
"FunctionalTestUtils": "1.0.0-beta8-*",
9-
"xunit.runner.aspnet": "2.0.0-aspnet-beta8-*",
10-
"Microsoft.AspNet.Diagnostics": "1.0.0-beta8-*"
9+
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-*",
10+
"Microsoft.ApplicationInsights.AspNet": "1.0.0-rc1-*",
11+
"FunctionalTestUtils": "1.0.0-rc1-*",
12+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-*",
13+
"Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*"
1114
},
1215

1316
"commands": {

‎test/FunctionalTestUtils/InProcessServer.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
using Microsoft.AspNet.Hosting.Server;
99
using Microsoft.AspNet.Http.Features;
1010
using Microsoft.Dnx.Runtime;
11-
using Microsoft.Dnx.Runtime.Infrastructure;
12-
using Microsoft.Framework.Configuration;
13-
using Microsoft.Framework.Configuration.Memory;
14-
using Microsoft.Framework.DependencyInjection;
15-
11+
using Microsoft.Extensions.DependencyInjection;
12+
using Microsoft.Extensions.Configuration;
13+
using Microsoft.Extensions.Configuration.Memory;
14+
using Microsoft.Extensions.PlatformAbstractions;
15+
1616
// a variant of aspnet/Hosting/test/Microsoft.AspNet.Hosting.Tests/HostingEngineTests.cs
1717
public class InProcessServer : IDisposable
1818
{
@@ -77,7 +77,7 @@ public void Dispose()
7777

7878
private WebHostBuilder CreateBuilder(IConfiguration config)
7979
{
80-
return new WebHostBuilder(CallContextServiceLocator.Locator.ServiceProvider, config);
80+
return new WebHostBuilder(config);
8181
}
8282
}
8383
}

‎test/FunctionalTestUtils/project.json‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
2-
"version": "1.0.0-beta8-*",
2+
"version": "1.0.0-rc1-*",
3+
"compilationOptions": {
4+
"keyFile": "../../keys/35MSSharedLib1024.snk",
5+
"delaySign": true
6+
},
37
"dependencies": {
48
"Microsoft.ApplicationInsights": "1.1.1-beta",
5-
"Microsoft.ApplicationInsights.AspNet": "1.0.0-beta8",
6-
"Microsoft.AspNet.Http.Abstractions": "1.0.0-beta8-*",
7-
"Microsoft.AspNet.Server.WebListener": "1.0.0-beta8-*",
8-
"Microsoft.Dnx.Runtime": "1.0.0-beta8-*",
9-
"xunit.runner.aspnet": "2.0.0-aspnet-beta8-*",
9+
"Microsoft.ApplicationInsights.AspNet": "1.0.0-rc1",
10+
"Microsoft.AspNet.Http.Abstractions": "1.0.0-rc1-*",
11+
"Microsoft.AspNet.Server.WebListener": "1.0.0-rc1-*",
12+
"Microsoft.Dnx.Runtime": "1.0.0-rc1-*",
13+
"xunit.runner.aspnet": "2.0.0-aspnet-rc1-*",
1014
"System.Net.Http": "4.0.0-beta-23109"
1115
},
1216

‎test/Microsoft.ApplicationInsights.AspNet.Tests/Extensions/ApplicationInsightsExtensionsTests.cs‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Microsoft.Framework.DependencyInjection
1+
namespace Microsoft.Extensions.DependencyInjection
22
{
33
using System;
44
using System.Diagnostics.Tracing;
@@ -13,17 +13,19 @@
1313
using Microsoft.AspNet.Builder;
1414
using Microsoft.AspNet.Http;
1515
using Microsoft.AspNet.Http.Internal;
16-
using Microsoft.Framework.Configuration;
16+
using Microsoft.Extensions.DependencyInjection;
17+
using Microsoft.Extensions.Configuration;
1718
using Xunit;
18-
19+
using System.Diagnostics;
20+
1921
public static class ApplicationInsightsExtensionsTests
2022
{
2123
public static ServiceCollection GetServiceCollectionWithContextAccessor()
2224
{
2325
var services = new ServiceCollection();
2426
IHttpContextAccessor contextAccessor = new HttpContextAccessor();
2527
services.AddInstance<IHttpContextAccessor>(contextAccessor);
26-
services.AddInstance<TelemetryListener>(TelemetryListener.DefaultListener);
28+
services.AddInstance<DiagnosticListener>(new DiagnosticListener("TestListener"));
2729
return services;
2830
}
2931

0 commit comments

Comments
 (0)