diff options
3 files changed, 22 insertions, 7 deletions
diff --git a/main/build/MacOSX/BinaryCheckerConfig.txt b/main/build/MacOSX/BinaryCheckerConfig.txt index 9387222bb7..48c1700f6e 100644 --- a/main/build/MacOSX/BinaryCheckerConfig.txt +++ b/main/build/MacOSX/BinaryCheckerConfig.txt @@ -7,6 +7,8 @@ !Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.AzureFunctions/azure-functions-cli
!Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.UnitTesting/NUnit3/Mono.Cecil.dll
!Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.UnitTesting/VsTestConsole/Microsoft.VisualStudio.QualityTools.Common.dll
+!Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.UnitTesting/VsTestConsole/Extensions/Microsoft.TestPlatform.TestHostRuntimeProvider.dll
+!Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.UnitTesting/VsTestConsole/Extensions/Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll
!Contents/Resources/lib/monodevelop/AddIns/MonoDevelop.Unity/Editor
!Contents/Resources/lib/monodevelop/AddIns/Xamarin.Ide.Identity
!Contents/Resources/lib/monodevelop/AddIns/Xamarin.Interactive.XS/Xamarin Inspector.app
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> |