Package reference fixes.

Make common classes internal

Src/Common/InjectionGuardConstants.cs

@@ -5,12 +5,7 @@
     /// These max limits are intentionally exaggerated to allow for unexpected responses, while still guarding against unreasonably large responses.
     /// Example: While a 32 character response may be expected, 50 characters may be permitted while a 10,000 character response would be unreasonable and malicious.
     /// </summary>
-#if DEPENDENCY_COLLECTOR
-    public
-#else
-    internal
-#endif
-    static class InjectionGuardConstants
+    internal static class InjectionGuardConstants
     {
         /// <summary>
         /// Max length of AppId allowed in response from Breeze.

Src/Common/StringUtilities.cs

@@ -8,12 +8,7 @@
     /// <summary>
     /// Generic functions to perform common operations on a string.
     /// </summary>
-#if DEPENDENCY_COLLECTOR
-    public
-#else
-    internal
-#endif
-    static class StringUtilities
+    internal static class StringUtilities
     {
         private static readonly uint[] Lookup32 = CreateLookup32();
 

Src/Common/W3C/W3CActivityExtensions.cs

@@ -13,12 +13,7 @@
     /// </summary>
     [Obsolete("Not ready for public consumption.")]
     [EditorBrowsable(EditorBrowsableState.Never)]
-#if DEPENDENCY_COLLECTOR
-    public
-#else
-    internal
-#endif
-    static class W3CActivityExtensions
+    internal static class W3CActivityExtensions
     {
         private static readonly Regex TraceIdRegex = new Regex("^[a-f0-9]{32}$", RegexOptions.Compiled);
         private static readonly Regex SpanIdRegex = new Regex("^[a-f0-9]{16}$", RegexOptions.Compiled);

Src/Common/W3C/W3CConstants.cs

@@ -8,12 +8,7 @@
     /// </summary>
     [Obsolete("Not ready for public consumption.")]
     [EditorBrowsable(EditorBrowsableState.Never)]
-#if DEPENDENCY_COLLECTOR
-    public
-#else
-    internal
-#endif
-    static class W3CConstants
+    internal static class W3CConstants
     {
         /// <summary>
         /// W3C traceparent header name.

Src/Common/W3C/W3COperationCorrelationTelemetryInitializer.cs

@@ -17,12 +17,7 @@
     [Obsolete("Not ready for public consumption.")]
     [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses", Justification = "TelemetryInitializers are intended to be instatiated by the framework when added to a config.")]
     [EditorBrowsable(EditorBrowsableState.Never)]
-#if DEPENDENCY_COLLECTOR
-    public
-#else
-    internal
-#endif
-    class W3COperationCorrelationTelemetryInitializer : ITelemetryInitializer
+    internal class W3COperationCorrelationTelemetryInitializer : ITelemetryInitializer
     {
         private const string RddDiagnosticSourcePrefix = "rdddsc";
         private const string SqlRemoteDependencyType = "SQL";

Src/Web/Web/Web.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Product.props" />
 
   <PropertyGroup>
@@ -45,6 +45,10 @@
     <!--Nuget Transforms (install.xdt, uninstall.xdt, config.transform): "nupkg\content\<framework>\*.*-->
     <Content Include="net45\*" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\WindowsServer\WindowsServer\WindowsServer.csproj" />
+  </ItemGroup>
   
   <ItemGroup>
     <!--Framework References-->  

Src/WindowsServer/WindowsServer/WindowsServer.csproj

@@ -36,11 +36,6 @@
     <!--Common Dependencies-->
     <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0-beta1" />
     <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.9.0-beta1" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.9.0-beta1">
-      <!--This is needed only in runtime as no code in WindowsServer package has compile time dependency on DependencyCollector-->
-      <IncludeAssets>runtime</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.9.0-beta1" />
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
   </ItemGroup>
 
@@ -57,11 +52,16 @@
     <Content Include="ApplicationInsights.config.uninstall.xdt" />
   </ItemGroup>
   
-  <ItemGroup  Condition="'$(TargetFramework)' == 'net45'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <!--Framework References-->    
     <Reference Include="System.Management" />
   </ItemGroup>
   
+  <ItemGroup>
+    <ProjectReference Include="..\..\DependencyCollector\DependencyCollector\DependencyCollector.csproj" />
+    <ProjectReference Include="..\..\PerformanceCollector\PerformanceCollector\Perf.csproj" />
+  </ItemGroup>
+  
   <Import Project="..\WindowsServer.Shared\WindowsServer.Shared.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), 'Common.targets'))\Common.targets" />