Add artifacts post processing

src/Assets/TestProjects/VSTestDataCollectorSample/AttachmentProcessorDataCollector.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Microsoft.NET.Test.Sdk package includes source files which shouldn't be automatically included. -->
+    <!-- Excluding those -->
+    <Compile Remove="pkgs\Microsoft.NET.Test.Sdk\**" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/VSTestDataCollectorSample/SampleDataCollector.cs

@@ -0,0 +1,95 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AttachmentProcessorDataCollector
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.IO;
+    using System.Linq;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using System.Xml;
+
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+    internal class ExtensionInfo
+    {
+        public const string ExtensionType = "DataCollector";
+        public const string ExtensionIdentifier = "my://sample/datacollector";
+    }
+
+    [DataCollectorFriendlyName("SampleDataCollector")]
+    [DataCollectorTypeUri(ExtensionInfo.ExtensionIdentifier)]
+    [DataCollectorAttachmentProcessor(typeof(SampleDataCollectorAttachmentProcessor))]
+    public class SampleDataCollectorV2 : SampleDataCollectorV1 { }
+
+    [DataCollectorFriendlyName("SampleDataCollector")]
+    [DataCollectorTypeUri(ExtensionInfo.ExtensionIdentifier)]
+    public class SampleDataCollectorV1 : DataCollector
+    {
+        private DataCollectionSink _dataCollectionSink;
+        private DataCollectionEnvironmentContext _context;
+        private readonly string _tempDirectoryPath = Path.GetTempPath();
+
+        public override void Initialize(
+            XmlElement configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext environmentContext)
+        {
+            events.SessionEnd += SessionEnded_Handler;
+            _dataCollectionSink = dataSink;
+            _context = environmentContext;
+        }
+
+        private void SessionEnded_Handler(object sender, SessionEndEventArgs e)
+        {
+            string tmpAttachment = Path.Combine(_tempDirectoryPath, Guid.NewGuid().ToString("N"), "DataCollectorAttachmentProcessor_1.txt");
+            Directory.CreateDirectory(Path.GetDirectoryName(tmpAttachment));
+            File.WriteAllText(tmpAttachment, $"SessionEnded_Handler_{Guid.NewGuid():N}");
+            _dataCollectionSink.SendFileAsync(_context.SessionDataCollectionContext, tmpAttachment, true);
+        }
+    }
+
+    public class SampleDataCollectorAttachmentProcessor : IDataCollectorAttachmentProcessor
+    {
+        public bool SupportsIncrementalProcessing => true;
+
+        public IEnumerable<Uri> GetExtensionUris()
+            => new List<Uri>() { new Uri(ExtensionInfo.ExtensionIdentifier) };
+
+        public Task<ICollection<AttachmentSet>> ProcessAttachmentSetsAsync(XmlElement configurationElement, ICollection<AttachmentSet> attachments, IProgress<int> progressReporter, IMessageLogger logger, CancellationToken cancellationToken)
+        {
+            string finalFileName = configurationElement.FirstChild.InnerText;
+            StringBuilder stringBuilder = new StringBuilder();
+            string finalFolder = null;
+            foreach (var attachmentSet in attachments)
+            {
+                foreach (var attachment in attachmentSet.Attachments.OrderBy(f => f.Uri.AbsolutePath))
+                {
+                    if (finalFolder is null)
+                    {
+                        finalFolder = Path.GetDirectoryName(attachment.Uri.AbsolutePath);
+                    }
+
+                    stringBuilder.AppendLine(File.ReadAllText(attachment.Uri.AbsolutePath).Trim());
+                }
+            }
+
+            File.WriteAllText(Path.Combine(finalFolder, finalFileName), stringBuilder.ToString());
+
+            List<AttachmentSet> mergedAttachment = new List<AttachmentSet>();
+            var mergedAttachmentSet = new AttachmentSet(new Uri("my://sample/datacollector"), "SampleDataCollector");
+            mergedAttachmentSet.Attachments.Add(UriDataAttachment.CreateFrom(Path.Combine(finalFolder, finalFileName), string.Empty));
+            mergedAttachment.Add(mergedAttachmentSet);
+
+            return Task.FromResult((ICollection<AttachmentSet>)new Collection<AttachmentSet>(mergedAttachment));
+        }
+    }
+}

src/Assets/TestProjects/VSTestDataCollectorSample/TestExtensionTypesAttribute.cs

@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using AttachmentProcessorDataCollector;
+
+using Microsoft.VisualStudio.TestPlatform;
+
+[assembly: TestExtensionTypes(typeof(SampleDataCollectorV1))]
+[assembly: TestExtensionTypesV2(ExtensionInfo.ExtensionType, ExtensionInfo.ExtensionIdentifier, typeof(SampleDataCollectorV1), 1, "futureUnused")]
+[assembly: TestExtensionTypesV2(ExtensionInfo.ExtensionType, ExtensionInfo.ExtensionIdentifier, typeof(SampleDataCollectorV2), 2)]
+
+namespace Microsoft.VisualStudio.TestPlatform
+{
+    using System;
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+    internal sealed class TestExtensionTypesAttribute : Attribute
+    {
+        public TestExtensionTypesAttribute(params Type[] types)
+        {
+            Types = types;
+        }
+
+        public Type[] Types { get; }
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = true)]
+    internal sealed class TestExtensionTypesV2Attribute : Attribute
+    {
+        public string ExtensionType { get; }
+        public string ExtensionIdentifier { get; }
+        public Type ExtensionImplementation { get; }
+        public int Version { get; }
+
+        public TestExtensionTypesV2Attribute(string extensionType, string extensionIdentifier, Type extensionImplementation, int version, string _ = null)
+        {
+            ExtensionType = extensionType;
+            ExtensionIdentifier = extensionIdentifier;
+            ExtensionImplementation = extensionImplementation;
+            Version = version;
+        }
+    }
+}

src/Assets/TestProjects/VSTestDataCollectorSampleNoMerge/AttachmentProcessorDataCollector.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+  <PropertyGroup>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <ItemGroup>
+	<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Microsoft.NET.Test.Sdk package includes source files which shouldn't be automatically included. -->
+    <!-- Excluding those -->
+    <Compile Remove="pkgs\Microsoft.NET.Test.Sdk\**" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/VSTestDataCollectorSampleNoMerge/SampleDataCollector.cs

@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace AttachmentProcessorDataCollector
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Collections.ObjectModel;
+    using System.IO;
+    using System.Linq;
+    using System.Text;
+    using System.Threading;
+    using System.Threading.Tasks;
+    using System.Xml;
+
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.DataCollection;
+    using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
+
+    internal class ExtensionInfo
+    {
+        public const string ExtensionType = "DataCollector";
+        public const string ExtensionIdentifier = "my://sample/datacollector";
+    }
+
+    [DataCollectorFriendlyName("SampleDataCollector")]
+    [DataCollectorTypeUri(ExtensionInfo.ExtensionIdentifier)]
+    public class SampleDataCollectorV1 : DataCollector
+    {
+        private DataCollectionSink _dataCollectionSink;
+        private DataCollectionEnvironmentContext _context;
+        private readonly string _tempDirectoryPath = Path.GetTempPath();
+
+        public override void Initialize(
+            XmlElement configurationElement,
+            DataCollectionEvents events,
+            DataCollectionSink dataSink,
+            DataCollectionLogger logger,
+            DataCollectionEnvironmentContext environmentContext)
+        {
+            events.SessionEnd += SessionEnded_Handler;
+            _dataCollectionSink = dataSink;
+            _context = environmentContext;
+        }
+
+        private void SessionEnded_Handler(object sender, SessionEndEventArgs e)
+        {
+            string tmpAttachment = Path.Combine(_tempDirectoryPath, Guid.NewGuid().ToString("N"), "DataCollectorAttachmentProcessor_1.txt");
+            Directory.CreateDirectory(Path.GetDirectoryName(tmpAttachment));
+            File.WriteAllText(tmpAttachment, $"SessionEnded_Handler_{Guid.NewGuid():N}");
+            _dataCollectionSink.SendFileAsync(_context.SessionDataCollectionContext, tmpAttachment, true);
+        }
+    }
+}

src/Assets/TestProjects/VSTestMultiProjectSolution/sln.sln

@@ -0,0 +1,34 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test1", "test1\test1.csproj", "{081584FC-1000-4F74-887E-480E08A2FAD4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test2", "test2\test2.csproj", "{F77D1353-8580-46B5-820F-50A899BEA1DD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test3", "test3\test3.csproj", "{9D8CCF24-5968-4E57-B181-98A026C8ABEA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{081584FC-1000-4F74-887E-480E08A2FAD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{081584FC-1000-4F74-887E-480E08A2FAD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{081584FC-1000-4F74-887E-480E08A2FAD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{081584FC-1000-4F74-887E-480E08A2FAD4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F77D1353-8580-46B5-820F-50A899BEA1DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F77D1353-8580-46B5-820F-50A899BEA1DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F77D1353-8580-46B5-820F-50A899BEA1DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F77D1353-8580-46B5-820F-50A899BEA1DD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D8CCF24-5968-4E57-B181-98A026C8ABEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D8CCF24-5968-4E57-B181-98A026C8ABEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D8CCF24-5968-4E57-B181-98A026C8ABEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D8CCF24-5968-4E57-B181-98A026C8ABEA}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

src/Assets/TestProjects/VSTestMultiProjectSolution/test1/UnitTest1.cs

@@ -0,0 +1,13 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace test1
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

src/Assets/TestProjects/VSTestMultiProjectSolution/test1/test1.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Microsoft.NET.Test.Sdk package includes source files which shouldn't be automatically included. -->
+    <!-- Excluding those -->
+    <Compile Remove="pkgs\Microsoft.NET.Test.Sdk\**" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/VSTestMultiProjectSolution/test2/UnitTest1.cs

@@ -0,0 +1,13 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace test2
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

src/Assets/TestProjects/VSTestMultiProjectSolution/test2/test2.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Microsoft.NET.Test.Sdk package includes source files which shouldn't be automatically included. -->
+    <!-- Excluding those -->
+    <Compile Remove="pkgs\Microsoft.NET.Test.Sdk\**" />
+  </ItemGroup>
+</Project>

src/Assets/TestProjects/VSTestMultiProjectSolution/test3/UnitTest1.cs

@@ -0,0 +1,13 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace test3
+{
+    [TestClass]
+    public class UnitTest1
+    {
+        [TestMethod]
+        public void TestMethod1()
+        {
+        }
+    }
+}

src/Assets/TestProjects/VSTestMultiProjectSolution/test3/test3.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MSTest.TestFramework" Version="$(MSTestVersion)" />
+    <PackageReference Include="MSTest.TestAdapter" Version="$(MSTestVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <!-- Microsoft.NET.Test.Sdk package includes source files which shouldn't be automatically included. -->
+    <!-- Excluding those -->
+    <Compile Remove="pkgs\Microsoft.NET.Test.Sdk\**" />
+  </ItemGroup>
+</Project>