Data Collector Process (microsoft#369)

* DataCollector Process. * Added tests. * Doc changes. * merged master, fixed build issues. * PR feedback. * fixed build issues. * PR feedback. * Fixed build issues. * fixed build issues. * reverting testplatform.targets related change for loc. * formatting changes in TestPlatform.targets. * removed extra space in TestPlatform.Targets. * added tracing for null or empty null runsettings.
navin22 · Jan 30, 2017 · 86db2f3 · 86db2f3
1 parent a08f694
commit 86db2f3
Show file tree

Hide file tree

Showing 75 changed files with 4,147 additions and 1,241 deletions.
diff --git a/TestPlatform.sln b/TestPlatform.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26118.0
+VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}"
 EndProject
@@ -13,8 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Core
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector", "src\datacollector\datacollector.csproj", "{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.x86", "src\datacollector.x86\datacollector.x86.csproj", "{2820F090-3F3D-4DA2-8CBA-B8273D695333}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Build", "src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.csproj", "{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}"
@@ -49,8 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{020E15
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{595BE9C1-E10F-4E50-938A-E6C248D3F950}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.x86.UnitTests", "test\datacollector.x86.UnitTests\datacollector.x86.UnitTests.csproj", "{F1001A64-974E-461E-B972-1A1330635677}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Client.UnitTests", "test\Microsoft.TestPlatform.Client.UnitTests\Microsoft.TestPlatform.Client.UnitTests.csproj", "{0D59BA81-6279-4650-AEBB-4EA735C28A1A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.TestPlatform.Common.UnitTests", "test\Microsoft.TestPlatform.Common.UnitTests\Microsoft.TestPlatform.Common.UnitTests.csproj", "{DE730F17-7D5C-4D9D-B479-025024BF4F1D}"
@@ -126,6 +122,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleClassLibrary", "test\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject3", "test\TestAssets\SimpleTestProject3\SimpleTestProject3.csproj", "{9549C1A4-CB57-4689-B3EB-F752F65F863F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "datacollector.UnitTests", "test\datacollector.UnitTests\datacollector.UnitTests.csproj", "{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -172,18 +170,6 @@ Global
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.Build.0 = Release|x64
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.ActiveCfg = Release|x86
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.Build.0 = Release|x86
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x64.ActiveCfg = Debug|x64
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x64.Build.0 = Debug|x64
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x86.ActiveCfg = Debug|x86
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x86.Build.0 = Debug|x86
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x64.ActiveCfg = Release|x64
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x64.Build.0 = Release|x64
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x86.ActiveCfg = Release|x86
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x86.Build.0 = Release|x86
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -340,18 +326,6 @@ Global
 		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x64.Build.0 = Release|Any CPU
 		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.ActiveCfg = Release|Any CPU
 		{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.Build.0 = Release|Any CPU
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|x64.ActiveCfg = Debug|x64
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|x64.Build.0 = Debug|x64
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|x86.ActiveCfg = Debug|x86
-		{F1001A64-974E-461E-B972-1A1330635677}.Debug|x86.Build.0 = Debug|x86
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|x64.ActiveCfg = Release|x64
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|x64.Build.0 = Release|x64
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|x86.ActiveCfg = Release|x86
-		{F1001A64-974E-461E-B972-1A1330635677}.Release|x86.Build.0 = Release|x86
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.ActiveCfg = Debug|x64
@@ -700,6 +674,18 @@ Global
 		{9549C1A4-CB57-4689-B3EB-F752F65F863F}.Release|x64.Build.0 = Release|x64
 		{9549C1A4-CB57-4689-B3EB-F752F65F863F}.Release|x86.ActiveCfg = Release|x86
 		{9549C1A4-CB57-4689-B3EB-F752F65F863F}.Release|x86.Build.0 = Release|x86
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x64.ActiveCfg = Debug|x64
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x64.Build.0 = Debug|x64
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x86.ActiveCfg = Debug|x86
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Debug|x86.Build.0 = Debug|x86
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x64.ActiveCfg = Release|x64
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x64.Build.0 = Release|x64
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.ActiveCfg = Release|x86
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -708,7 +694,6 @@ Global
 		{50C00046-0DA3-4B5C-9F6F-7BE1145E156A} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
-		{2820F090-3F3D-4DA2-8CBA-B8273D695333} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{6F5EC38C-4A11-40D3-827C-F607B90BEFF0} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
 		{E19B5128-3469-492E-82E1-725631C4A68C} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959}
@@ -726,7 +711,6 @@ Global
 		{46250E12-4CF1-4051-B4A7-80C8C06E0068} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{020E15EA-731F-4667-95AF-226671E0C3AE} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{595BE9C1-E10F-4E50-938A-E6C248D3F950} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
-		{F1001A64-974E-461E-B972-1A1330635677} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{0D59BA81-6279-4650-AEBB-4EA735C28A1A} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{DE730F17-7D5C-4D9D-B479-025024BF4F1D} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
@@ -758,5 +742,6 @@ Global
 		{EFA38DEF-C2BB-42AE-8B68-B31D79F3107E} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 		{0D85D957-6FF2-4620-B766-B708801D97F3} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
 		{9549C1A4-CB57-4689-B3EB-F752F65F863F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}
+		{0C6EFAF9-CE3E-4C11-8DD8-D7DABB206E5C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}
 	EndGlobalSection
 EndGlobal
diff --git a/scripts/build.ps1 b/scripts/build.ps1
@@ -187,7 +187,6 @@ function Publish-Package
     $testhostCorePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore")
     $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj"
     $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj"
-    $dataCollectorx86Project = Join-Path $env:TP_ROOT_DIR "src\datacollector.x86\datacollector.x86.csproj"
 
     Write-Log "Package: Publish package\*.csproj"
 
@@ -204,7 +203,6 @@ function Publish-Package
     Publish-Package-Internal $dataCollectorProject $TPB_TargetFramework $fullCLRPackageDir
     Publish-Package-Internal $dataCollectorProject $TPB_TargetFrameworkCore $coreCLRPackageDir
 
-    Write-Log "Package: Publish src\datacollector.x86\datacollector.x86.csproj"
     Publish-Package-Internal $dataCollectorx86Project $TPB_TargetFramework $fullCLRPackageDir
 
     # Publish testhost

diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets
@@ -5,8 +5,8 @@
     <TestPlatformPackageDir>$(TestPlatformRoot)packages\</TestPlatformPackageDir>
   </PropertyGroup>
   <!-- hack for bug https://github.com/Microsoft/msbuild/issues/1400#issuecomment-268179321 -->
-  <Import Project="$(MSBuildSDKsPath)\Microsoft.NET.SDK\Sdk\Sdk.targets" /> 
-
+  <Import Project="$(MSBuildSDKsPath)\Microsoft.NET.SDK\Sdk\Sdk.targets" />
+  
   <ItemGroup>
     <ResxLang Include="cs;de;es;fr;it;ja;ko;pl;pt-BR;ru;tr;zh-Hans;zh-Hant" />
   </ItemGroup>

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/DataCollectionRequestHandler.cs
@@ -4,30 +4,63 @@
 namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection
 {
     using System;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
     using System.Collections.ObjectModel;
+
+    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
-    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
     using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.DataCollection.Interfaces;
-    using Microsoft.VisualStudio.TestPlatform.Common.DataCollection;
+    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
+    using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
+    /// <summary>
+    /// The data collection request handler interface.
+    /// </summary>
     internal class DataCollectionRequestHandler : IDataCollectionRequestHandler, IDisposable
     {
         private readonly ICommunicationManager communicationManager;
         private IDataSerializer dataSerializer;
 
-        public DataCollectionRequestHandler()
+        private static DataCollectionRequestHandler RequestHandler;
+        private static readonly object obj = new object();
+
+        internal DataCollectionRequestHandler()
             : this(new SocketCommunicationManager(), JsonDataSerializer.Instance)
         {
         }
 
+        /// <summary>
+        /// Initializes a new instance of the <see cref="DataCollectionRequestHandler"/> class. 
+        /// </summary>
+        /// <param name="communicationManager">
+        /// </param>
+        /// <param name="dataSerializer">
+        /// </param>
         internal DataCollectionRequestHandler(ICommunicationManager communicationManager, IDataSerializer dataSerializer)
         {
             this.communicationManager = communicationManager;
             this.dataSerializer = dataSerializer;
         }
 
+        /// <summary>
+        /// Gets singleton instance of DataCollectionRequestHandler.
+        /// </summary>
+        public static DataCollectionRequestHandler Instance
+        {
+            get
+            {
+                lock (obj)
+                {
+                    if (RequestHandler == null)
+                    {
+                        RequestHandler = new DataCollectionRequestHandler();
+                    }
+                    return RequestHandler;
+                }
+            }
+        }
+
         /// <summary>
         /// The dispose.
         /// </summary>
@@ -45,15 +78,13 @@ public void Close()
             EqtTrace.Info("Closing the connection !");
         }
 
-        /// <summary>
-        /// Setups client based on port
-        /// </summary>
-        /// <param name="port">port number to connect</param>
+        /// <inheritdoc />
         public void InitializeCommunication(int port)
         {
             this.communicationManager.SetupClientAsync(port);
         }
 
+        /// <inheritdoc />
         public bool WaitForRequestSenderConnection(int connectionTimeout)
         {
             return this.communicationManager.WaitForServerConnection(connectionTimeout);
@@ -93,5 +124,14 @@ public void ProcessRequests()
             }
             while (!isSessionEnd);
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="args"></param>
+        public void SendDataCollectionMessage(DataCollectionMessageEventArgs args)
+        {
+            this.communicationManager.SendMessage(MessageType.DataCollectionMessage, args);
+        }
     }
 }
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Friends.cs
@@ -8,4 +8,3 @@
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("datacollector.x86, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs
@@ -47,7 +47,7 @@ public static class MessageType
         /// The discovery started.
         /// </summary>
         public const string StartDiscovery = "TestDiscovery.Start";
-       
+
         /// <summary>
         /// The test cases found.
         /// </summary>
@@ -138,6 +138,11 @@ public static class MessageType
         /// </summary>
         public const string LaunchAdapterProcessWithDebuggerAttachedCallback = "TestExecution.LaunchAdapterProcessWithDebuggerAttachedCallback";
 
+        /// <summary>
+        /// Data Collection Message
+        /// </summary>
+        public const string DataCollectionMessage = "DataCollection.SendMessage";
+
         #region DataCollector messages
 
         /// <summary>

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/DataCollectionLauncher.cs
@@ -19,8 +19,7 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
     /// </summary>
     internal class DataCollectionLauncher : IDataCollectionLauncher
     {
-        private const string X64DataCollectorProcessName = "datacollector.exe";
-        private const string X86DataCollectorProcessName = "datacollector.x86.exe";
+        private const string DataCollectorProcessName = "datacollector.exe";
         private const string DotnetProcessName = "dotnet.exe";
         private const string DotnetProcessNameXPlat = "dotnet";
 
@@ -54,7 +53,7 @@ internal DataCollectionLauncher(IProcessHelper processHelper)
         /// <param name="architecture">architecture for the host</param>
         public void Initialize(Architecture architecture)
         {
-            this.dataCollectorProcessName = (architecture == Architecture.X86) ? X86DataCollectorProcessName : X64DataCollectorProcessName;
+            this.dataCollectorProcessName = DataCollectorProcessName;
         }
 
         /// <summary>

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Friends.cs
@@ -5,6 +5,5 @@
 
 [assembly: InternalsVisibleTo("Microsoft.TestPlatform.CrossPlatEngine.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
-[assembly: InternalsVisibleTo("datacollector.x86, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("datacollector, PublicKey = 002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
diff --git a/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs b/src/Microsoft.TestPlatform.ObjectModel/AttachmentSet.cs
@@ -5,8 +5,6 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel
 {
     using System;
     using System.Collections.Generic;
-    using System.Linq;
-    using System.Text;
     using System.Runtime.Serialization;
 
     /// <summary>
@@ -17,10 +15,8 @@ public class AttachmentSet
     {
         /// <summary>
         /// URI of the sender. 
-        /// 
         /// If a data-collector is sending this set, then it should be uri of the data collector. Also if an 
         /// executor is sending this attachment, then it should be uri of executor. 
-        /// 
         /// </summary>
         [DataMember]
         public Uri Uri {get; private set;}
@@ -33,7 +29,6 @@ public class AttachmentSet
 
         /// <summary>
         /// List of data attachments. 
-        /// 
         /// These attachments can be things such as files that the collector/adapter wants to make available to the publishers.
         /// </summary>
         [DataMember]