Merging Web vs Web.Shared and WindowsServer vs WindowsServer.Shared (#1826)

* Merging Web and Web.Shared

* Merging WindowsServer and WindowsServer.Shared

* updating framework version, removing old projects from web.sln

Everything.sln

@@ -121,14 +121,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20Ne
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.Tests", "WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.shproj", "{9B524BD3-682D-4B6F-9251-D4B2911DF0FD}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Web.Shared", "WEB\Src\Web\Web.Shared.Net\Web.Shared.shproj", "{395E03BB-D061-4C9D-9D47-18676566444D}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsServer.Net45.Tests", "WEB\Src\WindowsServer\WindowsServer.Net45.Tests\WindowsServer.Net45.Tests.csproj", "{F05EB480-B209-47DD-90E3-1DDC47EFC579}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.NetCore.Tests", "WEB\Src\WindowsServer\WindowsServer.NetCore.Tests\WindowsServer.NetCore.Tests.csproj", "{74051BFB-87ED-4D99-927F-C40E7717E4E5}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared", "WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.shproj", "{579F42E8-B711-411E-BE52-4A3FD208507F}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared.Tests", "WEB\Src\WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.shproj", "{7916AE39-AE89-4886-8842-33AC9883905A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "L) GenericTests", "L) GenericTests", "{D2A0AA36-57F7-436C-A7AF-7322927F1734}"
@@ -202,13 +198,11 @@ Global
 		LOGGING\src\CommonShared\CommonShared.projitems*{3774003c-91fd-4d79-99c7-9beac5b9a48e}*SharedItemsImports = 5
 		LOGGING\test\CommonTestShared\CommonTestShared.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5
 		LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{37e15186-87a4-42eb-ab59-cedb99ca2640}*SharedItemsImports = 5
-		WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13
 		LOGGING\test\CommonTestShared\CommonTestShared.projitems*{3b9ab7fa-562d-4e4e-86e3-3348426bc0d9}*SharedItemsImports = 13
 		NETCORE\src\Shared\Shared.projitems*{3cab7f66-3cc4-4b46-9b0d-765c460fe2bf}*SharedItemsImports = 5
 		LOGGING\src\CommonShared\CommonShared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5
 		LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{52b3c054-c686-4bb8-a4b7-9e8d6c49491f}*SharedItemsImports = 5
 		WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13
-		WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{579f42e8-b711-411e-be52-4a3fd208507f}*SharedItemsImports = 13
 		LOGGING\src\CommonShared\CommonShared.projitems*{587b624b-8c64-498e-93d7-a2d2abc17eab}*SharedItemsImports = 13
 		LOGGING\src\CommonShared\CommonShared.projitems*{63b8fda7-2ff5-4a20-8de7-ebb036012a54}*SharedItemsImports = 5
 		WEB\Src\DependencyCollector\Shared\DependencyCollector.Shared.projitems*{669e7e58-072d-4b0a-a4dd-4eb2ae2ea4d4}*SharedItemsImports = 13
@@ -220,9 +214,7 @@ Global
 		LOGGING\test\CommonTestShared\CommonTestShared.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5
 		LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{7a903abd-d7fb-4610-aed8-32eb2cbaeebf}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5
-		WEB\Src\WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{7b5d95ee-50ee-4222-a03c-fae5905b3dfd}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5
-		WEB\Src\Web\Web.Shared.Net\Web.Shared.Net.projitems*{8293bc71-7ddc-4dd1-8807-280eef7e752d}*SharedItemsImports = 5
 		WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5
 		WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{8f641c0b-a57a-43ec-b91f-4258f6dc0cd5}*SharedItemsImports = 5
 		BASE\src\Common\Common\Common.projitems*{936af739-4297-4016-9d70-4280042709be}*SharedItemsImports = 13
@@ -509,10 +501,8 @@ Global
 		{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 		{054C25DC-E545-4712-95C4-81F30CF65CE8} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 		{9B524BD3-682D-4B6F-9251-D4B2911DF0FD} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
-		{395E03BB-D061-4C9D-9D47-18676566444D} = {07076842-9CAA-4B4A-8AEF-88DE88CD37AC}
 		{F05EB480-B209-47DD-90E3-1DDC47EFC579} = {11AC7235-167E-40B5-B2E3-9CBF08700064}
 		{74051BFB-87ED-4D99-927F-C40E7717E4E5} = {11AC7235-167E-40B5-B2E3-9CBF08700064}
-		{579F42E8-B711-411E-BE52-4A3FD208507F} = {11AC7235-167E-40B5-B2E3-9CBF08700064}
 		{7916AE39-AE89-4886-8842-33AC9883905A} = {11AC7235-167E-40B5-B2E3-9CBF08700064}
 		{262792BF-31A8-4FCD-BBC7-341EB29FAE96} = {D2A0AA36-57F7-436C-A7AF-7322927F1734}
 		{058A0843-A95F-4B0D-91DB-33B9D3FD7324} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}

WEB/Src/Microsoft.ApplicationInsights.Web.sln

@@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{1A75535C-B8E5-4C31-BC6E-50456C8C4052}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Web.Shared", "Web\Web.Shared.Net\Web.Shared.shproj", "{395E03BB-D061-4C9D-9D47-18676566444D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFramework", "TestFramework", "{8CA9F9C9-DA39-4159-86F3-C52F1636715E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DependencyCollector", "DependencyCollector", "{DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}"
@@ -18,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsServer", "WindowsSer
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsServer.Net45.Tests", "WindowsServer\WindowsServer.Net45.Tests\WindowsServer.Net45.Tests.csproj", "{F05EB480-B209-47DD-90E3-1DDC47EFC579}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared", "WindowsServer\WindowsServer.Shared\WindowsServer.Shared.shproj", "{579F42E8-B711-411E-BE52-4A3FD208507F}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "WindowsServer.Shared.Tests", "WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.shproj", "{7916AE39-AE89-4886-8842-33AC9883905A}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "DependencyCollector.Shared", "DependencyCollector\Shared\DependencyCollector.Shared.shproj", "{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4}"
@@ -112,16 +108,13 @@ Global
 		..\..\BASE\src\Common\Common\Common.projitems*{2bb7f06b-f094-417f-8c1b-7fcca1192e17}*SharedItemsImports = 5
 		PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.projitems*{30a45441-0849-48fe-ad37-5d29d0e3068a}*SharedItemsImports = 13
 		Common\Common.projitems*{30ae1a5d-775a-4dec-9f87-849d8ae93e3a}*SharedItemsImports = 5
-		Web\Web.Shared.Net\Web.Shared.Net.projitems*{395e03bb-d061-4c9d-9d47-18676566444d}*SharedItemsImports = 13
 		..\..\BASE\src\Common\Common\Common.projitems*{41301181-f4be-4c36-b78d-a29c55cb0469}*SharedItemsImports = 5
 		PerformanceCollector\Filtering.Shared\Filtering.Shared.projitems*{568aeb4f-ba4c-47a5-9fa3-68f06cd11fed}*SharedItemsImports = 13
-		WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{579f42e8-b711-411e-be52-4a3fd208507f}*SharedItemsImports = 13
 		DependencyCollector\Shared\DependencyCollector.Shared.projitems*{669e7e58-072d-4b0a-a4dd-4eb2ae2ea4d4}*SharedItemsImports = 13
 		PerformanceCollector\Perf.Shared.NetStandard16.Stubs\Perf.Shared.NetStandard16.Stubs.projitems*{76b21faa-270d-47de-b14b-bec87edc34f1}*SharedItemsImports = 13
 		WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems*{7916ae39-ae89-4886-8842-33ac9883905a}*SharedItemsImports = 13
 		Common\Common.projitems*{80f0481a-66c7-4442-96d3-5fd841132c4b}*SharedItemsImports = 5
 		Common\Common.projitems*{94127fd9-e516-4891-98d4-ef7523117f32}*SharedItemsImports = 5
-		WindowsServer\WindowsServer.Shared\WindowsServer.Shared.projitems*{94127fd9-e516-4891-98d4-ef7523117f32}*SharedItemsImports = 5
 		Common\Common.projitems*{95d90911-2909-4914-920e-7710f7bb6c32}*SharedItemsImports = 5
 		DependencyCollector\Shared\DependencyCollector.Shared.projitems*{95d90911-2909-4914-920e-7710f7bb6c32}*SharedItemsImports = 5
 		TestFramework\Shared\TestFramework.Shared.projitems*{9718f051-147f-4f5f-9ff3-c926430efcf7}*SharedItemsImports = 13
@@ -138,7 +131,6 @@ Global
 		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{d5efa02a-971e-477c-896b-c3aa93093267}*SharedItemsImports = 5
 		TestFramework\Shared\TestFramework.Shared.projitems*{d5efa02a-971e-477c-896b-c3aa93093267}*SharedItemsImports = 5
 		Common\Common.projitems*{e166d200-0687-4e6d-b836-029ae690aeab}*SharedItemsImports = 5
-		Web\Web.Shared.Net\Web.Shared.Net.projitems*{e166d200-0687-4e6d-b836-029ae690aeab}*SharedItemsImports = 5
 		TestFramework\Shared\TestFramework.Shared.projitems*{f05eb480-b209-47dd-90e3-1ddc47efc579}*SharedItemsImports = 4
 		WindowsServer\WindowsServer.Shared.Tests\WindowsServer.Shared.Tests.projitems*{f05eb480-b209-47dd-90e3-1ddc47efc579}*SharedItemsImports = 4
 		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4
@@ -300,9 +292,7 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{395E03BB-D061-4C9D-9D47-18676566444D} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052}
 		{F05EB480-B209-47DD-90E3-1DDC47EFC579} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
-		{579F42E8-B711-411E-BE52-4A3FD208507F} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
 		{7916AE39-AE89-4886-8842-33AC9883905A} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
 		{669E7E58-072D-4B0A-A4DD-4EB2AE2EA4D4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
 		{ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}

WEB/Src/Web/Web.Shared.Net/Implementation/HttpRequestExtensions.cs

@@ -1,31 +0,0 @@
-namespace Microsoft.ApplicationInsights.Web.Implementation
-{
-    using System;
-    using System.Web;
-    using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
-
-    /// <summary>
-    /// HttpRequest Extensions.
-    /// </summary>
-    internal static partial class HttpRequestExtensions
-    {
-        public static string GetUserHostAddress(this HttpRequest httpRequest)
-        {
-            if (httpRequest == null)
-            {
-                return null;
-            }
-
-            try
-            {
-                return httpRequest.UserHostAddress;
-            }
-            catch (ArgumentException exp)
-            {
-                // System.ArgumentException: Value does not fall within the expected range. Fails in IIS7, WCF OneWay.
-                WebEventSource.Log.UserHostNotCollectedWarning(exp.ToInvariantString());
-                return null;
-            }
-        }
-    }
-}

WEB/Src/Web/Web.Shared.Net/Web.Shared.Net.projitems

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="SharedProjectFile_SccProperties">
-    <SharedProjectFile_ProjectGuid>{9D7715BB-E4D0-499C-B8A3-63466FC8AA5D}</SharedProjectFile_ProjectGuid>
-  </PropertyGroup>
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>395e03bb-d061-4c9d-9d47-18676566444d</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.ApplicationInsights.Web</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AccountIdTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ApplicationInsightsHttpModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AuthenticatedUserIdTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AzureAppServiceRoleNameFromHostNameHeaderInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HttpContextBaseExtension.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)HttpContextExtension.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\ActivityHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AppMapCorrelationEventSource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\ExceptionHandlersInjector.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\HttpContextExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\HttpRequestExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\RequestTrackingConstants.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\RequestTrackingExtensions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\SyntheticUserAgentFilter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\WebEventSource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\WebTelemetryInitializerBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\WebTelemetryModuleBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)OperationCorrelationTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Extensibility\Implementation\PostSamplingTelemetryProcessor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Properties\AssemblyInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ClientIpHeaderTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExceptionTrackingTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)OperationNameTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RequestTrackingTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)RequestTrackingUtilities.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SessionTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)WebTestTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)SyntheticUserAgentTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UserTelemetryInitializer.cs" />
-  </ItemGroup>
-</Project>

WEB/Src/Web/Web.Shared.Net/Web.Shared.shproj

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>395e03bb-d061-4c9d-9d47-18676566444d</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="Web.Shared.Net.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

WEB/Src/Web/Web.Tests/Web.Tests.csproj

@@ -6,7 +6,7 @@
   
   <PropertyGroup>
     <AssemblyName>Microsoft.ApplicationInsights.Web.Tests</AssemblyName>
-    <TargetFrameworks>net4.5</TargetFrameworks>
+    <TargetFrameworks>net45</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\Web\Web.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net4.5'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Drawing" />

WEB/Src/Web/Web/Implementation/HttpRequestExtensions.cs

@@ -4,6 +4,7 @@
     using System.Collections.Specialized;
     using System.Web;
     using Microsoft.ApplicationInsights.Common;
+    using Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing;
 
     /// <summary>
     /// HttpRequest Extensions.
@@ -43,5 +44,24 @@
         {
             return httpRequest.Unvalidated.Headers;
         }
+
+        public static string GetUserHostAddress(this HttpRequest httpRequest)
+        {
+            if (httpRequest == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                return httpRequest.UserHostAddress;
+            }
+            catch (ArgumentException exp)
+            {
+                // System.ArgumentException: Value does not fall within the expected range. Fails in IIS7, WCF OneWay.
+                WebEventSource.Log.UserHostNotCollectedWarning(exp.ToInvariantString());
+                return null;
+            }
+        }
     }
 }

WEB/Src/Web/Web/Web.csproj

@@ -69,7 +69,5 @@
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Unshipped.txt" />
   </ItemGroup>
-
-  <Import Project="..\Web.Shared.Net\Web.Shared.Net.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
 </Project>

WEB/Src/WindowsServer/WindowsServer.Shared/WindowsServer.Shared.projitems

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <HasSharedItems>true</HasSharedItems>
-    <SharedGUID>579f42e8-b711-411e-be52-4a3fd208507f</SharedGUID>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
-    <Import_RootNamespace>Microsoft.ApplicationInsights.WindowsServer</Import_RootNamespace>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)AssemblyInfo.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AzureInstanceMetadataTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AzureWebAppRoleEnvironmentTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)BuildInfoConfigComponentVersionTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)DeveloperModeWithDebuggerAttachedTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)DomainNameRoleInstanceTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)AppServicesHeartbeatTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)GlobalSuppressions.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AppServiceEnvironmentVariableMonitor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AzureComputeMetadataHeartbeatPropertyProvider.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AzureMetadataRequestor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\DataContracts\AzureInstanceComputeMetadata.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\EnvironmentVariableMonitor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\IAzureMetadataRequestor.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\WindowsServerEventSource.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UnobservedExceptionTelemetryModule.cs" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
-    <Compile Include="$(MSBuildThisFileDirectory)AzureRoleEnvironmentTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)DeviceTelemetryInitializer.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)FirstChanceExceptionStatisticsTelemetryModule.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AzureRoleEnvironmentContextReader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\AzureServiceRuntimeAssemblyLoader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\DeviceContextReader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\IAzureRoleEnvironmentContextReader.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\MetricManager.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\Role.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\RoleEnvironment.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\RoleInstance.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\RuntimeBindingObject.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Implementation\ServiceRuntime.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)UnhandledExceptionTelemetryModule.cs" />
-  </ItemGroup>
-</Project>

WEB/Src/WindowsServer/WindowsServer.Shared/WindowsServer.Shared.shproj

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>579f42e8-b711-411e-be52-4a3fd208507f</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
-  <PropertyGroup />
-  <Import Project="WindowsServer.Shared.projitems" Label="Shared" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-</Project>

WEB/Src/WindowsServer/WindowsServer/AzureRoleEnvironmentTelemetryInitializer.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;    
     using Microsoft.ApplicationInsights.Channel;
@@ -91,3 +92,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/DeviceTelemetryInitializer.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;
     using Microsoft.ApplicationInsights.Channel;
@@ -31,3 +32,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/FirstChanceExceptionStatisticsTelemetryModule.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;
     using System.Collections.Generic;
@@ -508,3 +509,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/AzureRoleEnvironmentContextReader.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Diagnostics;
@@ -144,3 +145,4 @@
         }
     }    
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/AzureServiceRuntimeAssemblyLoader.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;    
     using System.Globalization;
@@ -86,3 +87,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/DeviceContextReader.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Globalization;
@@ -169,3 +170,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/IAzureRoleEnvironmentContextReader.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     /// <summary>
     /// The user context reader interface used while reading user related information in a platform specific way.
@@ -23,3 +24,4 @@
         string GetRoleInstanceName();
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/MetricManager.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;
     using System.Collections;
@@ -1391,3 +1392,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/Role.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Reflection;
@@ -49,3 +50,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/RoleEnvironment.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Reflection;
@@ -87,3 +88,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/RoleInstance.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Reflection;
@@ -66,3 +67,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/RuntimeBindingObject.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System;
     using System.Globalization;
@@ -160,3 +161,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/Implementation/ServiceRuntime.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer.Implementation
 {
     using System.Reflection;
 
@@ -27,3 +28,4 @@
         }        
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/UnhandledExceptionTelemetryModule.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.WindowsServer
+#if NET45
+namespace Microsoft.ApplicationInsights.WindowsServer
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
@@ -103,3 +104,4 @@
         }
     }
 }
+#endif

WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj

@@ -82,7 +82,5 @@
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Shipped.txt" />
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Unshipped.txt" />
   </ItemGroup>
-  
-  <Import Project="..\WindowsServer.Shared\WindowsServer.Shared.projitems" Label="Shared" />
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
 </Project>