Merge pull request #43 from Microsoft/olegsych/MoveExtensionsToDependencyInjectionNamespace

Move ApplicationInsightsExtensions to Microsoft.Framework.DependencyInjection namespace
2015-04-23 16:46:23 -07:00 · 2015-04-23 16:46:23 -07:00 · 2829bd7ff2
--- a/src/Microsoft.ApplicationInsights.AspNet/Extensions/ApplicationInsightsExtensions.cs
+++ b/src/Microsoft.ApplicationInsights.AspNet/Extensions/ApplicationInsightsExtensions.cs
@ -1,7 +1,9 @@
-namespace Microsoft.ApplicationInsights.AspNet
+namespace Microsoft.Framework.DependencyInjection
 {
    using System;
    using System.Collections.Generic;
+    using Microsoft.ApplicationInsights;
+    using Microsoft.ApplicationInsights.AspNet;
    using Microsoft.ApplicationInsights.AspNet.ContextInitializers;
    using Microsoft.ApplicationInsights.AspNet.TelemetryInitializers;
    using Microsoft.ApplicationInsights.Channel;
@ -10,7 +12,6 @@
    using Microsoft.AspNet.Builder;
    using Microsoft.AspNet.Mvc.Rendering;
    using Microsoft.Framework.ConfigurationModel;
-    using Microsoft.Framework.DependencyInjection;

    public static class ApplicationInsightsExtensions
    {
--- a/test/Microsoft.ApplicationInsights.AspNet.Tests/Extensions/ApplicationInsightsExtensionsTests.cs
+++ b/test/Microsoft.ApplicationInsights.AspNet.Tests/Extensions/ApplicationInsightsExtensionsTests.cs
@ -1,17 +1,18 @@
-namespace Microsoft.ApplicationInsights.AspNet.Tests
+namespace Microsoft.Framework.DependencyInjection
 {
    using System;
    using System.IO;
    using System.Linq;
+    using Microsoft.ApplicationInsights;
    using Microsoft.ApplicationInsights.AspNet.ContextInitializers;
    using Microsoft.ApplicationInsights.AspNet.TelemetryInitializers;
+    using Microsoft.ApplicationInsights.AspNet.Tests;
    using Microsoft.ApplicationInsights.AspNet.Tests.Helpers;
    using Microsoft.ApplicationInsights.Channel;
    using Microsoft.ApplicationInsights.Extensibility;
    using Microsoft.AspNet.Builder;
    using Microsoft.AspNet.Hosting;
    using Microsoft.Framework.ConfigurationModel;
-    using Microsoft.Framework.DependencyInjection;
    using Xunit;

    public static class ApplicationInsightsExtensionsTests
--- a/test/Mvc6Framework45.FunctionalTests/Startup.cs
+++ b/test/Mvc6Framework45.FunctionalTests/Startup.cs
@ -1,16 +1,13 @@
 using System;
 using FunctionalTestUtils;
-using Microsoft.ApplicationInsights.AspNet;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Diagnostics;
 using Microsoft.AspNet.Diagnostics.Entity;
 using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Identity;
 using Microsoft.AspNet.Identity.EntityFramework;
 using Microsoft.Framework.ConfigurationModel;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Logging;
-using Microsoft.Framework.Logging.Console;
 using SampleWebAppIntegration.Models;

 namespace SampleWebAppIntegration
--- a/test/Mvc6Framework45.FunctionalTests/Views/Shared/_Layout.cshtml
+++ b/test/Mvc6Framework45.FunctionalTests/Views/Shared/_Layout.cshtml
@ -1,4 +1,4 @@
-@using Microsoft.ApplicationInsights.AspNet
+@using Microsoft.Framework.DependencyInjection
@inject Microsoft.ApplicationInsights.DataContracts.RequestTelemetry RequestTelemetry 
 <!DOCTYPE html>
 <html>
--- a/test/WebApiShimFw46.FunctionalTests/Startup.cs
+++ b/test/WebApiShimFw46.FunctionalTests/Startup.cs
@ -1,15 +1,9 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.ApplicationInsights.AspNet;
+using FunctionalTestUtils;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Hosting;
-using Microsoft.AspNet.Http;
-using Microsoft.AspNet.Routing;
-using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.ConfigurationModel;
-using FunctionalTestUtils;
+using Microsoft.Framework.DependencyInjection;

 namespace SampleWebAPIIntegration
 {