diff options
| author | Mike Krüger <mikkrg@microsoft.com> | 2019-02-15 07:15:43 +0300 |
|---|---|---|
| committer | Mike Krüger <mikkrg@microsoft.com> | 2019-02-25 18:46:31 +0300 |
| commit | 1e6127ccc8cb91089be3204c9fa8d42ee5291306 (patch) | |
| tree | d583578872d2b9c549808f5d2e8115013720a4e1 /main/src/addins/MonoDevelop.UnitTesting | |
| parent | 71b3bea5cbaf3aaf642aeaf4a02991f862263d81 (diff) | |
Fixes VSTS Bug 781628: VSM didn't run tests with error 'vstest.console
failed to connect'
https://devdiv.visualstudio.com/DevDiv/_workitems/edit/781628
Diffstat (limited to 'main/src/addins/MonoDevelop.UnitTesting')
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs | 2 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj | 25 |
2 files changed, 20 insertions, 7 deletions
diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs index a70082fb5c..5e17f52100 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.VsTest/VsTestAdapter.cs @@ -210,6 +210,8 @@ namespace MonoDevelop.UnitTesting.VsTest { string vsTestConsoleExeFolder = Path.Combine (Path.GetDirectoryName (typeof (VsTestAdapter).Assembly.Location), "VsTestConsole"); string vsTestConsoleExe = Path.Combine (vsTestConsoleExeFolder, "vstest.console.exe"); + if (!File.Exists (vsTestConsoleExe)) + LoggingService.LogError ("vstest.console.exe not found : " + vsTestConsoleExe); var executionCommand = Runtime.ProcessService.CreateCommand (vsTestConsoleExe); executionCommand.Arguments = GetVSTestArguments (vsTestConsoleExe, port); executionCommand.WorkingDirectory = vsTestConsoleExeFolder; diff --git a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj index 264728ae52..b96f0f2c68 100644 --- a/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj +++ b/main/src/addins/MonoDevelop.UnitTesting/MonoDevelop.UnitTesting.csproj @@ -156,13 +156,24 @@ </ItemGroup> <ItemGroup> <DownloadNupkg Include="Microsoft.TestPlatform" Version="$(NuGetVersionMicrosoftTestPlatform)" /> - <ExtensionContent - Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\**\*.*" - Exclude="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" - Link="VsTestConsole\Extensions\%(RecursiveDir)%(Filename)%(Extension)" /> - <ExtensionContent - Include="$(DownloadNupkgDirectory)Microsoft.TestPlatform.$(NuGetVersionMicrosoftTestPlatform)\tools\net451\Extensions\**\*.*" - Link="VsTestConsole\%(RecursiveDir)%(Filename)%(Extension)" /> </ItemGroup> + <ItemGroup> + <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> + <Target Name="CopyTestAdapters" BeforeTargets="Build"> + <Copy SourceFiles="@(VsTestConsole)" DestinationFolder="$(OutputPath)\VsTestConsole\%(RecursiveDir)" SkipUnchangedFiles="true" /> + <Copy SourceFiles="@(VsTestConsoleExtensions)" DestinationFolder="$(OutputPath)\VsTestConsole\Extensions\" SkipUnchangedFiles="true" /> + </Target> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> |