From 0f22666b4008718ed5fded959aacca3dab93ee56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Kr=C3=BCger?= <mikkrg@microsoft.com>
Date: Thu, 28 Feb 2019 12:10:45 +0100
Subject: Fixes VSTS Bug 781628: VSM didn't run tests with error
 'vstest.console failed to connect'

https://devdiv.visualstudio.com/DevDiv/_workitems/edit/781628
---
 .../MonoDevelop.UnitTesting.csproj                 | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

(limited to 'main/src/addins/MonoDevelop.UnitTesting')

diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
index b96f0f2c68..8c886db1e9 100644
--- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
+++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj
@@ -157,21 +157,22 @@
   <ItemGroup>
     <DownloadNupkg Include="Microsoft.TestPlatform" Version="$(NuGetVersionMicrosoftTestPlatform)" />
   </ItemGroup>
-  <ItemGroup>
-    <VsTestConsole Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\**\*.*">
-      <Visible>false</Visible>
-    </VsTestConsole>
-    <VsTestConsole Remove="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" />
-  </ItemGroup>
+ 
+  <Target Name="CopyTestAdapters" AfterTargets="DownloadNupkg">
     <ItemGroup>
-    <VsTestConsoleExtensions Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll">
-      <Visible>false</Visible>
-    </VsTestConsoleExtensions>
-    <VsTestConsoleExtensions Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll">
-      <Visible>false</Visible>
-    </VsTestConsoleExtensions>
-  </ItemGroup>
-  <Target Name="CopyTestAdapters" BeforeTargets="Build">
+      <VsTestConsole Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\**\*.*">
+        <Visible>false</Visible>
+      </VsTestConsole>
+      <VsTestConsole Remove="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" />
+    </ItemGroup>
+    <ItemGroup>
+      <VsTestConsoleExtensions Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll">
+        <Visible>false</Visible>
+      </VsTestConsoleExtensions>
+      <VsTestConsoleExtensions Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll">
+        <Visible>false</Visible>
+      </VsTestConsoleExtensions>
+    </ItemGroup>
     <Copy SourceFiles="@(VsTestConsole)" DestinationFolder="$(OutputPath)\VsTestConsole\%(RecursiveDir)" SkipUnchangedFiles="true" />
     <Copy SourceFiles="@(VsTestConsoleExtensions)" DestinationFolder="$(OutputPath)\VsTestConsole\Extensions\" SkipUnchangedFiles="true" />
   </Target>
-- 
cgit v1.2.3