Conditionally change namespace for common classes to avoid ambiguity

Src/Common/HeadersUtilities.cs

@@ -4,6 +4,11 @@
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
+#if DEPENDENCY_COLLECTOR
+    using Microsoft.ApplicationInsights.Common;
+#else
+    using Microsoft.ApplicationInsights.Common.Internal;
+#endif
 
     /// <summary>
     /// Generic functions that can be used to get and set Http headers.

Src/Common/InjectionGuardConstants.cs

@@ -1,4 +1,8 @@
-namespace Microsoft.ApplicationInsights.Common
+#if DEPENDENCY_COLLECTOR
+    namespace Microsoft.ApplicationInsights.Common
+#else
+namespace Microsoft.ApplicationInsights.Common.Internal
+#endif
 {
     /// <summary>
     /// These values are listed to guard against malicious injections by limiting the max size allowed in an HTTP Response.

Src/Common/StringUtilities.cs

@@ -1,4 +1,8 @@
-namespace Microsoft.ApplicationInsights.Common
+#if DEPENDENCY_COLLECTOR
+    namespace Microsoft.ApplicationInsights.Common
+#else
+    namespace Microsoft.ApplicationInsights.Common.Internal
+#endif
 {
     using System;
     using System.Diagnostics;

Src/Common/W3C/W3CActivityExtensions.cs

@@ -10,7 +10,11 @@
     using System.Globalization;
     using System.Linq;
     using System.Text.RegularExpressions;
+#if DEPENDENCY_COLLECTOR
     using Microsoft.ApplicationInsights.Common;
+#else
+    using Microsoft.ApplicationInsights.Common.Internal;
+#endif
 
     /// <summary>
     /// Extends Activity to support W3C distributed tracing standard.

Src/Common/W3C/W3COperationCorrelationTelemetryInitializer.cs

@@ -9,11 +9,15 @@ namespace Microsoft.ApplicationInsights.W3C.Internal
     using System.Diagnostics;
     using System.Diagnostics.CodeAnalysis;
     using System.Linq;
-    using Microsoft.ApplicationInsights.Channel;
+    using Microsoft.ApplicationInsights.Channel;    
-    using Microsoft.ApplicationInsights.Common;
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
+#if DEPENDENCY_COLLECTOR
+    using Microsoft.ApplicationInsights.Common;
+#else
+    using Microsoft.ApplicationInsights.Common.Internal;
+#endif
 
     /// <summary>
     /// Telemetry Initializer that sets correlation ids for W3C.