Merging Perf test projects (#1839)

* Merging Perf test projects

* re-adding TestApp45 as available to use Perf

* removing netstandard.httplistener dependency, solving building error

Everything.sln

@@ -97,12 +97,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventCounterCollector.Tests
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "WEB\Src\PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.NetCore.Tests", "WEB\Src\PerformanceCollector\NetCore.Tests\Perf.NetCore.Tests.csproj", "{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf-NetCore20.Tests", "WEB\Src\PerformanceCollector\NetCore20.Tests\Perf-NetCore20.Tests\Perf-NetCore20.Tests.csproj", "{07620299-B0E7-44BB-BE85-C4D1B25104F6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Net45.Tests", "WEB\Src\PerformanceCollector\Perf.Net45.Tests\Perf.Net45.Tests.csproj", "{F254D4FB-428D-408E-8251-39BCA7B4B5CE}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "WEB\Src\PerformanceCollector\Perf.Shared\Perf.Shared.shproj", "{A78F50D4-F518-4DCB-878B-526FD54CCA35}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetFull", "WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.shproj", "{0196259C-3582-4F4E-A01F-A8F9AE83B0F3}"
@@ -167,16 +161,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.MVC.Tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests.EmptyApp.Tests", "NETCORE\test\FunctionalTests.EmptyApp.Tests\FunctionalTests.EmptyApp.Tests.csproj", "{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Tests", "WEB\Src\PerformanceCollector\Perf.Tests\Perf.Tests.csproj", "{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{0196259c-3582-4f4e-a01f-a8f9ae83b0f3}*SharedItemsImports = 13
 		WEB\Src\PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.projitems*{054c25dc-e545-4712-95c4-81f30cf65ce8}*SharedItemsImports = 13
-		WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5
-		WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{07620299-b0e7-44bb-be85-c4d1b25104f6}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{13335eb8-3936-407a-9363-1c428318bea8}*SharedItemsImports = 5
 		LOGGING\src\CommonShared\CommonShared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5
 		LOGGING\src\EventSource.Shared\EventSource.Shared\EventSource.Shared.projitems*{1b0f54bf-078a-421c-9708-2d817d4bce30}*SharedItemsImports = 5
 		LOGGING\src\CommonShared\CommonShared.projitems*{2612ac44-5ff3-4533-b5a5-e5dbf96f5c83}*SharedItemsImports = 5
+		WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{27b8d7be-8cb7-48bf-97da-0f031103c03d}*SharedItemsImports = 5
+		WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{27b8d7be-8cb7-48bf-97da-0f031103c03d}*SharedItemsImports = 5
 		LOGGING\src\CommonShared\CommonShared.projitems*{2e283031-425b-421f-9e81-34abfefab618}*SharedItemsImports = 5
 		LOGGING\test\CommonTestShared\CommonTestShared.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5
 		LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{305f1c02-f984-43e7-a07e-e2514cfe29a0}*SharedItemsImports = 5
@@ -198,8 +194,6 @@ Global
 		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\Common\Common.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
 		LOGGING\test\CommonTestShared\CommonTestShared.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5
 		LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{93a35062-6aa4-4778-9769-428a942adcf9}*SharedItemsImports = 5
@@ -229,8 +223,6 @@ Global
 		NETCORE\src\Shared\Shared.projitems*{d56f2979-d6bc-4ef2-bb9b-4077b3290599}*SharedItemsImports = 13
 		WEB\Src\Common\Common.projitems*{deeaf599-83f9-4a05-add6-f612cdabe570}*SharedItemsImports = 5
 		BASE\src\Common\Common\Common.projitems*{e3d160e8-7f8c-416f-946f-6fdfc6787461}*SharedItemsImports = 5
-		WEB\Src\PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4
-		WEB\Src\TestFramework\Shared\TestFramework.Shared.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4
 		BASE\Test\TestFramework\Shared\TestFramework.Shared.projitems*{f76c6cbd-29b0-4564-bdcb-c969f8fec136}*SharedItemsImports = 13
 		LOGGING\test\Shared\Adapters.Shared.Tests.projitems*{fa775630-7917-4a99-a78c-fba46edf685c}*SharedItemsImports = 13
 		WEB\Src\DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{fac049e4-7011-45ff-bd06-69aca28921e8}*SharedItemsImports = 5
@@ -325,18 +317,6 @@ Global
 		{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07620299-B0E7-44BB-BE85-C4D1B25104F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07620299-B0E7-44BB-BE85-C4D1B25104F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07620299-B0E7-44BB-BE85-C4D1B25104F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07620299-B0E7-44BB-BE85-C4D1B25104F6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{262792BF-31A8-4FCD-BBC7-341EB29FAE96}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -421,6 +401,10 @@ Global
 		{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{00FC8932-554B-455F-9E02-E8A4B0DBFAA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27B8D7BE-8CB7-48BF-97DA-0F031103C03D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -449,9 +433,6 @@ Global
 		{ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {005BD823-60AF-406E-AC20-842D7653FE60}
 		{BECFC6B1-E04E-431C-A4D9-6F330F7DE22D} = {DFCBB4ED-976C-4239-BCAF-8AA21E684E8C}
 		{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
-		{8F641C0B-A57A-43EC-B91F-4258F6DC0CD5} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
-		{07620299-B0E7-44BB-BE85-C4D1B25104F6} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 		{A78F50D4-F518-4DCB-878B-526FD54CCA35} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 		{0196259C-3582-4F4E-A01F-A8F9AE83B0F3} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 		{D13C3EC7-B300-4158-9054-216156B203BE} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
@@ -481,6 +462,7 @@ Global
 		{F677DF78-A630-464C-BEA9-3BBAEA97412F} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
 		{43D6CB2E-6EE7-4B2B-A517-0D70298ACDBF} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
 		{00FC8932-554B-455F-9E02-E8A4B0DBFAA8} = {E9AEB857-E8AA-4ED6-A020-DF4D8486CEB0}
+		{27B8D7BE-8CB7-48BF-97DA-0F031103C03D} = {3EDBC945-E531-4CEE-A038-A6AE1EF9AA96}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0E0415AF-37CC-4999-8E5B-DD36F75BFD4D}

WEB/Src/Microsoft.ApplicationInsights.Web.sln

@@ -20,8 +20,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "TestFramework.Shared.Web",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PerformanceCollector", "PerformanceCollector", "{A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Perf.Net45.Tests", "PerformanceCollector\Perf.Net45.Tests\Perf.Net45.Tests.csproj", "{F254D4FB-428D-408E-8251-39BCA7B4B5CE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xdt.Tests", "PerformanceCollector\Xdt.Tests\Xdt.Tests.csproj", "{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Solution Items", ".Solution Items", "{0828A19C-C62C-4B5E-9160-5A6F992F2000}"
@@ -41,8 +39,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared", "PerformanceC
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Filtering.Shared", "PerformanceCollector\Filtering.Shared\Filtering.Shared.shproj", "{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.NetCore.Tests", "PerformanceCollector\NetCore.Tests\Perf.NetCore.Tests.csproj", "{D5EFA02A-971E-477C-896B-C3AA93093267}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.Tests", "PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.shproj", "{9B524BD3-682D-4B6F-9251-D4B2911DF0FD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HostingStartup", "HostingStartup\HostingStartup\HostingStartup.csproj", "{80F0481A-66C7-4442-96D3-5FD841132C4B}"
@@ -61,8 +57,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf", "PerformanceCollecto
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard.Stubs", "PerformanceCollector\Perf.Shared.NetStandard.Stubs\Perf.Shared.NetStandard.Stubs.shproj", "{30A45441-0849-48FE-AD37-5D29D0E3068A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf-NetCore20.Tests", "PerformanceCollector\NetCore20.Tests\Perf-NetCore20.Tests\Perf-NetCore20.Tests.csproj", "{AC7D8533-C823-4E93-B008-51B3C4744E2E}"
-EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20Net45", "PerformanceCollector\Perf.Shared.NetStandard20Net45\Perf.Shared.NetStandard20Net45.shproj", "{054C25DC-E545-4712-95C4-81F30CF65CE8}"
 EndProject
 Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Perf.Shared.NetStandard20", "PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.shproj", "{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03}"
@@ -87,6 +81,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Web.Tests", "Web\Web.Tests\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsServer.Tests", "WindowsServer\WindowsServer.Tests\WindowsServer.Tests.csproj", "{CAF98D8B-9202-4CC3-83EC-C384D8EEA792}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Perf.Tests", "PerformanceCollector\Perf.Tests\Perf.Tests.csproj", "{E31B7A59-5E13-48BB-8127-D11D41EF16C5}"
+EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		Common\Common.projitems*{00bf736c-b562-4251-9836-ef80282956af}*SharedItemsImports = 5
@@ -112,17 +108,13 @@ Global
 		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{9b524bd3-682d-4b6f-9251-d4b2911df0fd}*SharedItemsImports = 13
 		PerformanceCollector\Perf.Shared\Perf.Shared.projitems*{a78f50d4-f518-4dcb-878b-526fd54cca35}*SharedItemsImports = 13
 		PerformanceCollector\Perf.Shared.NetStandard20\Perf.Shared.NetStandard20.projitems*{a8ba3bd0-19ce-488d-b2bd-0b9b677f4e03}*SharedItemsImports = 13
-		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{ac7d8533-c823-4e93-b008-51b3c4744e2e}*SharedItemsImports = 5
-		TestFramework\Shared\TestFramework.Shared.projitems*{ac7d8533-c823-4e93-b008-51b3c4744e2e}*SharedItemsImports = 5
 		DependencyCollector\Shared.Tests\DependencyCollector.Shared.Tests.projitems*{ace58393-3419-4fca-87cc-c33eb756c7e4}*SharedItemsImports = 13
 		TestFramework\Shared\TestFramework.Shared.projitems*{caf98d8b-9202-4cc3-83ec-c384d8eea792}*SharedItemsImports = 5
 		Common\Common.projitems*{ccab7a34-8dc5-4a6f-b637-46ceba93c687}*SharedItemsImports = 13
 		PerformanceCollector\Perf.Shared.NetStandard\Perf.Shared.NetStandard.projitems*{d13c3ec7-b300-4158-9054-216156b203be}*SharedItemsImports = 13
-		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
-		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4
+		PerformanceCollector\Perf.Shared.Tests\Perf.Shared.Tests.projitems*{e31b7a59-5e13-48bb-8127-d11d41ef16c5}*SharedItemsImports = 5
-		TestFramework\Shared\TestFramework.Shared.projitems*{f254d4fb-428d-408e-8251-39bca7b4b5ce}*SharedItemsImports = 4
+		TestFramework\Shared\TestFramework.Shared.projitems*{e31b7a59-5e13-48bb-8127-d11d41ef16c5}*SharedItemsImports = 5
 	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -131,14 +123,6 @@ Global
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -147,14 +131,6 @@ Global
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D5EFA02A-971E-477C-896B-C3AA93093267}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{80F0481A-66C7-4442-96D3-5FD841132C4B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -195,14 +171,6 @@ Global
 		{00BF736C-B562-4251-9836-EF80282956AF}.Release|Any CPU.Build.0 = Release|Any CPU
 		{00BF736C-B562-4251-9836-EF80282956AF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{00BF736C-B562-4251-9836-EF80282956AF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{30AE1A5D-775A-4DEC-9F87-849D8AE93E3A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -267,6 +235,14 @@ Global
 		{CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{CAF98D8B-9202-4CC3-83EC-C384D8EEA792}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -274,11 +250,9 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{ACE58393-3419-4FCA-87CC-C33EB756C7E4} = {DF56FBAD-8745-404B-94A1-E83BFC4AD7CB}
 		{9718F051-147F-4F5F-9FF3-C926430EFCF7} = {8CA9F9C9-DA39-4159-86F3-C52F1636715E}
-		{F254D4FB-428D-408E-8251-39BCA7B4B5CE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{C6B569BC-6F19-42C9-A951-DA611BB0F4BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{A78F50D4-F518-4DCB-878B-526FD54CCA35} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{568AEB4F-BA4C-47A5-9FA3-68F06CD11FED} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
-		{D5EFA02A-971E-477C-896B-C3AA93093267} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{9B524BD3-682D-4B6F-9251-D4B2911DF0FD} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{80F0481A-66C7-4442-96D3-5FD841132C4B} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
 		{94127FD9-E516-4891-98D4-EF7523117F32} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
@@ -288,7 +262,6 @@ Global
 		{D13C3EC7-B300-4158-9054-216156B203BE} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{00BF736C-B562-4251-9836-EF80282956AF} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{30A45441-0849-48FE-AD37-5D29D0E3068A} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
-		{AC7D8533-C823-4E93-B008-51B3C4744E2E} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{054C25DC-E545-4712-95C4-81F30CF65CE8} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{A8BA3BD0-19CE-488D-B2BD-0B9B677F4E03} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 		{2BB7F06B-F094-417F-8C1B-7FCCA1192E17} = {85C7566E-98C3-479D-AC4F-0D4B161B7D42}
@@ -298,6 +271,7 @@ Global
 		{7592A20A-1775-4479-B624-7275173E9821} = {701D2D4F-B581-45A2-AF29-4F34EC5F047B}
 		{1231D63B-E7FA-4BA7-9916-FA7325DB936D} = {1A75535C-B8E5-4C31-BC6E-50456C8C4052}
 		{CAF98D8B-9202-4CC3-83EC-C384D8EEA792} = {D87119AF-CD35-46F2-84A6-ED54CC42027E}
+		{E31B7A59-5E13-48BB-8127-D11D41EF16C5} = {A318CC6C-51C8-4BD6-BC85-2B4F35123BE7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {F99E0A07-C363-49BF-BFA7-C748391CE38E}

WEB/Src/PerformanceCollector/NetCore.Tests/Perf.NetCore.Tests.csproj

@@ -1,45 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NetCore.props))\NetCore.props" />
-
-  <Import Project="$(PropsRoot)\Test.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <AssemblyName>Microsoft.AI.PerformanceCollector.NetCore.Tests</AssemblyName>
-    <PackageId>Microsoft.AI.DependencyCollector.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
-    <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;1705;1591;8002</NoWarn>
-    <DefineConstants>TRACE;DEBUG;NETCORE;NETCOREAPP1_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;1705;1591;8002</NoWarn>
-    <DefineConstants>TRACE;RELEASE;NETCORE;NETCOREAPP1_0</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
-    <PackageReference Include="NETStandard.HttpListener" Version="1.0.2" />    
-    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\PerformanceCollector\Perf.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-  <Import Project="..\Perf.Shared.Tests\Perf.Shared.Tests.projitems" Label="Shared" />
-
-  <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
-</Project>

WEB/Src/PerformanceCollector/NetCore20.Tests/Perf-NetCore20.Tests/Perf-NetCore20.Tests.csproj

@@ -1,43 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NetCore.props))\NetCore.props" />
-
-  <Import Project="$(PropsRoot)\Test.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>Microsoft.AI.PerformanceCollector.NetCore20.Tests</AssemblyName>
-    <PackageId>Microsoft.AI.PerformanceCollector.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>    
-    <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <NoWarn>1701;1702;1705;1591;8002</NoWarn>
-    <DefineConstants>TRACE;DEBUG;NETCORE;NETCOREAPP2_0</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <NoWarn>1701;1702;1705;1591;8002</NoWarn>
-    <DefineConstants>TRACE;RELEASE;NETCORE;NETCOREAPP2_0</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />       
-    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\PerformanceCollector\Perf.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
-
-  <Import Project="..\..\Perf.Shared.Tests\Perf.Shared.Tests.projitems" Label="Shared" />
-
-  <Import Project="..\..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
-</Project>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/Perf.Net45.Tests.csproj

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
-  <Import Project="$(PropsRoot)\Test.props" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{F254D4FB-428D-408E-8251-39BCA7B4B5CE}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
-    <AssemblyName>Microsoft.AI.PerformanceCollector.Net45.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
-    <IsCodedUITest>False</IsCodedUITest>
-    <TestProjectType>UnitTest</TestProjectType>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), PerformanceCollectorTests.sln))</SolutionDir>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE;NET45</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <DefineConstants>TRACE;NET45</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\System.Buffers.4.5.1\lib\netstandard1.1\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\System.Diagnostics.DiagnosticSource.4.6.0\lib\net45\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\System.Memory.4.5.4\lib\netstandard1.1\System.Memory.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Web" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Filtering\CollectionConfigurationTests.cs" />
-    <Compile Include="PerformanceCollectorTestBase.cs" />
-    <Compile Include="QuickPulse\PerfLib\CategorySampleTests.cs" />
-    <Compile Include="QuickPulse\PerfLib\CounterDefinitionSampleTests.cs" />
-    <Compile Include="QuickPulse\PerfLib\PerformanceMonitorTests.cs" />
-    <Compile Include="QuickPulse\QuickPulseTelemetryModuleNetFullTests.cs" />
-    <Compile Include="QuickPulse\QuickPulseTopCpuCollectorTests.cs" />
-    <Compile Include="PerformanceCounterUtilityTests.cs" />
-    <Compile Include="PerformanceCollectorModuleTests.cs" />
-    <Compile Include="StandardPerformanceCollectorTests.cs" />
-    <Compile Include="TelemetryAction.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="QuickPulse\PerfLib\PerfData.data" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj">
-      <Project>{e3d160e8-7f8c-416f-946f-6fdfc6787461}</Project>
-      <Name>Microsoft.ApplicationInsights</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\PerformanceCollector\Perf.csproj">
-      <Project>{00bf736c-b562-4251-9836-ef80282956af}</Project>
-      <Name>Perf</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="..\Perf.Shared.Tests\Perf.Shared.Tests.projitems" Label="Shared" />
-  <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
-</Project>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/Settings.StyleCop

@@ -1,104 +0,0 @@
-<StyleCopSettings Version="105">
-  <GlobalSettings>
-    <StringProperty Name="MergeSettingsFiles">NoMerge</StringProperty>
-    <BooleanProperty Name="WriteCache">False</BooleanProperty>
-  </GlobalSettings>
-  <Parsers>
-    <Parser ParserId="StyleCop.CSharp.CsParser">
-      <ParserSettings>
-        <BooleanProperty Name="AnalyzeDesignerFiles">False</BooleanProperty>
-        <CollectionProperty Name="GeneratedFileFilters">
-          <Value>\.g\.cs$</Value>
-          <Value>\.generated\.cs$</Value>
-          <Value>\.g\.i\.cs$</Value>
-          <Value>TemporaryGeneratedFile_.*\.cs$</Value>
-        </CollectionProperty>
-      </ParserSettings>
-    </Parser>
-  </Parsers>
-  <Analyzers>
-    <Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
-      <Rules>
-        <Rule Name="PropertyDocumentationMustHaveValueText">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">True</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustBeginWithACapitalLetter">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">True</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="DocumentationTextMustEndWithAPeriod">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">True</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="ElementReturnValueMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="EnumerationItemsMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumented">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="GenericTypeParametersMustBeDocumentedPartialClass">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="FileMustHaveHeader">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings>
-        <StringProperty Name="CompanyName">Microsoft</StringProperty>
-        <StringProperty Name="Copyright">Copyright © Microsoft. All Rights Reserved.</StringProperty>
-      </AnalyzerSettings>
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.MaintainabilityRules">
-      <Rules>
-        <Rule Name="FieldsMustBePrivate">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-        <Rule Name="AccessModifierMustBeDeclared">
-          <RuleSettings>
-            <BooleanProperty Name="Enabled">False</BooleanProperty>
-          </RuleSettings>
-        </Rule>
-      </Rules>
-      <AnalyzerSettings />
-    </Analyzer>
-    <Analyzer AnalyzerId="StyleCop.CSharp.NamingRules">
-      <AnalyzerSettings>
-        <CollectionProperty Name="Hungarian">
-          <Value>if</Value>
-          <Value>is</Value>
-          <Value>on</Value>
-          <Value>to</Value>
-        </CollectionProperty>
-      </AnalyzerSettings>
-    </Analyzer>
-  </Analyzers>
-</StyleCopSettings>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.Sdk.Net45.targets

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<ItemGroup>
-		<Reference Include="Microsoft.ApplicationInsights">
-			<HintPath>$(BinRoot)\$(Configuration)\Src\Web\Web.Net45\Microsoft.ApplicationInsights.dll</HintPath>
-		</Reference>
-		<Reference Include="Microsoft.AI.Web">
-			<HintPath>$(BinRoot)\$(Configuration)\Src\Web\Web.Net45\Microsoft.AI.Web.dll</HintPath>
-		</Reference>
-		<Reference Include="Microsoft.AI.WindowsServer">
-			<HintPath>$(BinRoot)\$(Configuration)\Src\WindowsServer\WindowsServer.Net45\Microsoft.AI.WindowsServer.dll</HintPath>
-		</Reference>
-	</ItemGroup>
-
-	<Target Name="CopyAppInsightsSdkFiles">
-		<ItemGroup>
-			<_CustomFiles Include="
-										$(BinRoot)\$(Configuration)\Src\WindowsServer\WindowsServer.Net45\*.dll;
-										$(BinRoot)\$(Configuration)\Src\Web\Web.Net45\*.dll;
-										" />
-			<FilesForPackagingFromProject Include="%(_CustomFiles.Identity)">
-				<DestinationRelativePath>%(RecursiveDir)bin\%(Filename)%(Extension)</DestinationRelativePath>
-			</FilesForPackagingFromProject>
-		</ItemGroup>
-	</Target>
-
-	<!---->
-	<PropertyGroup>
-		<CopyAllFilesToSingleFolderForPackageDependsOn>
-			CopyAppInsightsSdkFiles;
-			$(CopyAllFilesToSingleFolderForPackageDependsOn);
-		</CopyAllFilesToSingleFolderForPackageDependsOn>
-		<OnAfterCopyAllFilesToSingleFolderForPackage>
-		</OnAfterCopyAllFilesToSingleFolderForPackage>
-		<CopyAllFilesToSingleFolderForMsdeployDependsOn>
-			CopyAppInsightsSdkFiles;
-			$(CopyAllFilesToSingleFolderForPackageDependsOn);
-		</CopyAllFilesToSingleFolderForMsdeployDependsOn>
-	</PropertyGroup>
-
-</Project>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/Test.Common.props

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove('$(MSBuildThisFileDirectory)\..', 'Test.props'))\Test.props" />
- </Project>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/app.config

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Diagnostics.Tracing.EventSource" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.1.28.0" newVersion="1.1.28.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.6.10.0" newVersion="2.6.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

WEB/Src/PerformanceCollector/Perf.Net45.Tests/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net45" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net45" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.6.0" targetFramework="net45" />
-  <package id="System.Memory" version="4.5.4" targetFramework="net45" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net45" />
-</packages>

WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseServiceClientTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if !NETCOREAPP1_0
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Collections.Concurrent;
@@ -127,16 +128,10 @@
             Uri serviceEndpoint = new Uri(string.Format(CultureInfo.InvariantCulture, "http://localhost:{0}", port));
             this.TestContext.Properties[ServiceEndpointPropertyName] = serviceEndpoint;
 
-#if NETCOREAPP1_0
-            this.Listener = new HttpListener(IPAddress.Loopback, port);
-#else
             this.Listener = new HttpListener();
             string uriPrefix = string.Format(CultureInfo.InvariantCulture, "http://localhost:{0}/", port);
             this.Listener.Prefixes.Add(uriPrefix);
-#endif
-
             this.Listener.Start();
-
             this.AssertionSync = new SemaphoreSlim(0);
 
             var eventListenerReady = new AutoResetEvent(false);
@@ -163,13 +158,13 @@
             }
         }
 
-    [TestMethod]
+        [TestMethod]
         public void QuickPulseServiceClientPingsTheService()
         {
             // ARRANGE
             string instance = Guid.NewGuid().ToString();
             var timestamp = DateTimeOffset.UtcNow;
-                        
+
             var serviceClient = new QuickPulseServiceClient(this.TestContext.Properties[ServiceEndpointPropertyName] as Uri, instance, instance, instance, string.Empty, new Clock(), false, 0);
 
             // ACT
@@ -1775,7 +1770,7 @@
                     new Exception("Exception2"),
                     Tuple.Create("Prop2", "Val2")),
             };
-            
+
             // ACT
             CollectionConfigurationInfo configurationInfo;
             serviceClient.SubmitSamples(
@@ -2010,11 +2005,8 @@
                 try
                 {
                     ev.Set();
-#if NETCOREAPP1_0
+
-                    HttpListenerContext context = listener.GetContextAsync().GetAwaiter().GetResult();
-#else
                     HttpListenerContext context = listener.GetContext();
-#endif
 
                     var request = context.Request;
 
@@ -2027,64 +2019,64 @@
                     switch (request.Url.LocalPath)
                     {
                         case "/ping":
-                        {
+                            {
-                            this.pingCount++;
+                                this.pingCount++;
 
-                            this.pingResponse(context.Response);
+                                this.pingResponse(context.Response);
 
-                            var dataPoint =
+                                var dataPoint =
-                                (MonitoringDataPoint) serializerDataPoint.ReadObject(context.Request.InputStream);
+                                    (MonitoringDataPoint)serializerDataPoint.ReadObject(context.Request.InputStream);
-                            var transmissionTime = long.Parse(
+                                var transmissionTime = long.Parse(
-                                context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName],
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName],
-                                CultureInfo.InvariantCulture);
+                                    CultureInfo.InvariantCulture);
-                            var instanceName =
+                                var instanceName =
-                                context.Request.Headers[QuickPulseConstants.XMsQpsInstanceNameHeaderName];
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsInstanceNameHeaderName];
-                            var machineName = context.Request.Headers[QuickPulseConstants.XMsQpsMachineNameHeaderName];
+                                var machineName = context.Request.Headers[QuickPulseConstants.XMsQpsMachineNameHeaderName];
-                            var invariantVersion =
+                                var invariantVersion =
-                                context.Request.Headers[QuickPulseConstants.XMsQpsInvariantVersionHeaderName];
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsInvariantVersionHeaderName];
-                            var streamId = context.Request.Headers[QuickPulseConstants.XMsQpsStreamIdHeaderName];
+                                var streamId = context.Request.Headers[QuickPulseConstants.XMsQpsStreamIdHeaderName];
-                            var collectionConfigurationETag =
+                                var collectionConfigurationETag =
-                                context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName];
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName];
 
-                            this.pings.Add(
+                                this.pings.Add(
-                                Tuple.Create(
+                                    Tuple.Create(
-                                    new PingHeaders()
+                                        new PingHeaders()
-                                    {
+                                        {
-                                        TransmissionTime = new DateTimeOffset(transmissionTime, TimeSpan.Zero),
+                                            TransmissionTime = new DateTimeOffset(transmissionTime, TimeSpan.Zero),
-                                        InstanceName = instanceName,
+                                            InstanceName = instanceName,
-                                        MachineName = machineName,
+                                            MachineName = machineName,
-                                        InvariantVersion = int.Parse(invariantVersion, CultureInfo.InvariantCulture),
+                                            InvariantVersion = int.Parse(invariantVersion, CultureInfo.InvariantCulture),
-                                        StreamId = streamId
+                                            StreamId = streamId
-                                    },
+                                        },
-                                    collectionConfigurationETag,
+                                        collectionConfigurationETag,
-                                    dataPoint));
+                                        dataPoint));
 
-                            this.lastPingTimestamp = dataPoint.Timestamp;
+                                this.lastPingTimestamp = dataPoint.Timestamp;
-                            this.lastPingInstance = dataPoint.Instance;
+                                this.lastPingInstance = dataPoint.Instance;
-                            this.lastVersion = dataPoint.Version;
+                                this.lastVersion = dataPoint.Version;
-                        }
+                            }
 
                             break;
                         case "/post":
-                        {
+                            {
-                            this.submitCount++;
+                                this.submitCount++;
 
-                            this.submitResponse(context.Response);
+                                this.submitResponse(context.Response);
 
-                            var dataPoints =
+                                var dataPoints =
-                                serializerDataPointArray.ReadObject(context.Request.InputStream) as MonitoringDataPoint
+                                    serializerDataPointArray.ReadObject(context.Request.InputStream) as MonitoringDataPoint
-                                    [];
+                                        [];
-                            var transmissionTime = long.Parse(
+                                var transmissionTime = long.Parse(
-                                context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName],
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsTransmissionTimeHeaderName],
-                                CultureInfo.InvariantCulture);
+                                    CultureInfo.InvariantCulture);
-                            var collectionConfigurationETag =
+                                var collectionConfigurationETag =
-                                context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName];
+                                    context.Request.Headers[QuickPulseConstants.XMsQpsConfigurationETagHeaderName];
 
-                            this.samples.AddRange(
+                                this.samples.AddRange(
-                                dataPoints.Select(
+                                    dataPoints.Select(
-                                    dp => Tuple.Create(new DateTimeOffset(transmissionTime, TimeSpan.Zero),
+                                        dp => Tuple.Create(new DateTimeOffset(transmissionTime, TimeSpan.Zero),
-                                        collectionConfigurationETag, dp)));
+                                            collectionConfigurationETag, dp)));
-                        }
+                            }
 
                             break;
                         default:
@@ -2118,7 +2110,7 @@
                 message: string.Format(CultureInfo.InvariantCulture, "Not all requests finished processing: expected {0}, actual: {1}", requestCount, waitTasks.Count(task => task.Result)));
         }
 
-#endregion
+        #endregion
 
         private class PingHeaders
         {
@@ -2133,4 +2125,5 @@
             public string StreamId { get; set; }
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Shared.Tests/QuickPulse/QuickPulseTestHelper.cs

@@ -1,12 +1,12 @@
 namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
-#if NETCORE
+#if NETCOREAPP
     using System.Reflection;
 #endif
     using Microsoft.ApplicationInsights.Extensibility;
     using Microsoft.ApplicationInsights.Extensibility.Implementation;
-#if !NETCORE
+#if !NETCOREAPP
     using Microsoft.VisualStudio.TestTools.UnitTesting;
 #endif
 
@@ -23,7 +23,7 @@
 
         private static void SetPrivateStaticField(Type type, string fieldName, object value)
         {
-#if NETCORE
+#if NETCOREAPP
             TypeInfo typeInfo = type.GetTypeInfo();
             FieldInfo field = typeInfo.GetField(fieldName, BindingFlags.NonPublic | BindingFlags.Static);
             field.SetValue(null, value);

WEB/Src/PerformanceCollector/Perf.Shared/AssemblyInfo.cs

@@ -5,11 +5,8 @@ using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: InternalsVisibleTo("TestApp40, PublicKey=" + AssemblyInfo.PublicKey)]
 [assembly: InternalsVisibleTo("TestApp45, PublicKey=" + AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.Net45.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
+[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
-[assembly: InternalsVisibleTo("Microsoft.AI.PerformanceCollector.NetCore20.Tests, PublicKey=" + AssemblyInfo.PublicKey)]
 
 internal static class AssemblyInfo
 {

WEB/Src/PerformanceCollector/Perf.Tests/Filtering/CollectionConfigurationTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Linq;
@@ -892,4 +893,5 @@
             Assert.AreEqual(null, errors[2].Data["FilterComparand"]);
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj

@@ -0,0 +1,66 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'Test.props'))\Test.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), NetCore.props))\NetCore.props" />
+
+  <Import Project="$(PropsRoot)\Test.props" />
+
+  <PropertyGroup>
+    <TargetFrameworks>net45;netcoreapp1.0;netcoreapp2.0</TargetFrameworks>
+    <AssemblyName>Microsoft.AI.PerformanceCollector.Tests</AssemblyName>
+    <PackageId>Microsoft.AI.DependencyCollector.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="QuickPulse\PerfLib\PerfData.data" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.1" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
+    <PackageReference Include="System.Diagnostics.StackTrace" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <Reference Include="System" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.XML" />
+    <PackageReference Include="Microsoft.Diagnostics.Tracing.EventSource.Redist" Version="1.1.28" />
+    <PackageReference Include="System.Buffers" Version="4.5.1" />
+    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="4.5.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\PerformanceCollector\Perf.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="WebAppPerformanceCollector\SampleFiles\RemoteEnvironmentVariablesAllSampleOne.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="WebAppPerformanceCollector\SampleFiles\RemoteEnvironmentVariablesAllSampleTwo.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Folder Include="obj\" />
+  </ItemGroup>
+  
+  <Import Project="..\Perf.Shared.Tests\Perf.Shared.Tests.projitems" Label="Shared" />
+  <Import Project="..\..\TestFramework\Shared\TestFramework.Shared.projitems" Label="Shared" />
+</Project>

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorModuleTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Collections.Generic;
@@ -389,3 +390,4 @@
         }
     }
 }
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorTestBase.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Diagnostics;
@@ -201,4 +202,5 @@
             Assert.IsTrue(results[0].Item2 >= 0 && results[0].Item2 <= 100);           
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTestBase.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NETCOREAPP2_0
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Diagnostics;
@@ -81,4 +82,5 @@
             Assert.AreEqual(@"\Process(??APP_WIN32_PROC??)\% Processor Time", oneCounter.Single().OriginalString);
         }        
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorXPlatformTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NETCOREAPP2_0
+namespace Microsoft.ApplicationInsights.Tests
 {
     using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation;
     using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.XPlatform;
@@ -22,4 +23,5 @@
             this.PerformanceCollectorAddRemoveCountersForXPlatformTest(new PerformanceCollectorXPlatform());
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCounterUtilityTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System.Collections.Concurrent;
     using System.Linq;
@@ -99,4 +100,5 @@
             Assert.AreEqual(string.Empty, pc.InstanceName);
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CategorySampleTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System.Collections.Generic;
     using System.IO;
@@ -50,4 +51,5 @@
             Assert.AreEqual("Idle", categorySample.InstanceNameTable.First().Key);
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/CounterDefinitionSampleTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Runtime.InteropServices;
@@ -77,4 +78,5 @@
             handle.Free();
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/PerfLib/PerformanceMonitorTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.QuickPulse.PerfLib;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -20,4 +21,5 @@
             Assert.IsTrue(data.Length > 0);
         }       
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTelemetryModuleNetFullTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests.QuickPulse
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests.QuickPulse
 {
     using System;
     using System.Collections.Generic;
@@ -115,3 +116,4 @@
         }
     }
 }
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/QuickPulse/QuickPulseTopCpuCollectorTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using System;
     using System.Collections;
@@ -313,4 +314,5 @@
             Assert.IsFalse(flagWhenEverythingIsBackToNormalForGood);
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/StandardPerformanceCollectorTests.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.Tests
+#if NET45
+namespace Microsoft.ApplicationInsights.Tests
 {
     using Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector.Implementation.StandardPerfCollector;
     using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -51,4 +52,5 @@
             this.PerformanceCollectorNormalizedCpuTest(new StandardPerformanceCollector());
         }
     }
-}
+}
+#endif

WEB/Src/PerformanceCollector/Perf.Tests/TelemetryAction.cs

@@ -1,4 +1,5 @@
-namespace Microsoft.ApplicationInsights.TestFramework
+#if NET45
+namespace Microsoft.ApplicationInsights.TestFramework
 {
     using Microsoft.ApplicationInsights.Channel;
 
@@ -7,3 +8,4 @@
     /// </summary>
     public delegate void TelemetryAction(ITelemetry telemetry);
 }
+#endif

WEB/Src/TestFramework/Shared/SdkVersionHelper.cs

@@ -2,7 +2,7 @@
 {
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
     using System;
-#if NETCORE
+#if NETCOREAPP
     using System.Collections.Generic;
 #endif
     using System.Linq;
@@ -12,7 +12,7 @@
     {
         public static string GetExpectedSdkVersion(Type assemblyType, string prefix)
         {
-#if NETCORE
+#if NETCOREAPP
             IEnumerable<Attribute> assemblyCustomAttributes = assemblyType.GetTypeInfo().Assembly.GetCustomAttributes();
 #else
             object[] assemblyCustomAttributes = assemblyType.Assembly.GetCustomAttributes(false);