Skip to content

Commit

Permalink
Find vstest.console.dll from the same directory where Microsoft.TestP…
Browse files Browse the repository at this point in the history
…latform.targets reside (microsoft#342)

* Find vstest.console.dll from the same directory where Microsoft.TestPlatform.targets reside
  • Loading branch information
Faizan2304 authored and codito committed Jan 19, 2017
1 parent 932eb53 commit 0202a8b
Showing 1 changed file with 3 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Load Microsoft.TestPlatform.Build.Tasks.dll, this can be overridden to use a different version with $(VSTestTaskAssemblyFile) -->
<PropertyGroup>
<VSTestTaskAssemblyFile Condition="$(VSTestTaskAssemblyFile) == ''">Microsoft.TestPlatform.Build.dll</VSTestTaskAssemblyFile>
<VSTestConsoleFile Condition="$(VSTestConsoleFile) == ''">vstest.console.dll</VSTestConsoleFile>
<VSTestConsolePath Condition="$(VSTestConsoleFile) == ''">$([System.IO.Path]::Combine($(MSBuildThisFileDirectory),"vstest.console.dll"))</VSTestConsolePath>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>
<UsingTask TaskName="Microsoft.TestPlatform.Build.Tasks.VSTestTask" AssemblyFile="$(VSTestTaskAssemblyFile)" />
Expand Down Expand Up @@ -41,7 +41,7 @@ Copyright (c) .NET Foundation. All rights reserved.
VSTestListTests="$(VSTestListTests)"
VSTestDiag="$(VSTestDiag)"
VSTestCLIRunSettings="$(VSTestCLIRunSettings)"
VSTestConsolePath="$(VSTestConsoleFile)"
VSTestConsolePath="$(VSTestConsolePath)"
VSTestResultsDirectory="$(VSTestResultsDirectory)"
/>
</Target>
Expand Down Expand Up @@ -78,6 +78,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Message Text="VSTestDiag = $(VSTestDiag)" Importance="low" />
<Message Text="VSTestCLIRunSettings = $(VSTestCLIRunSettings)" Importance="low" />
<Message Text="VSTestResultsDirectory = $(VSTestResultsDirectory)" Importance="low" />
<Message Text="VSTestConsolePath = $(VSTestConsolePath)" Importance="low" />
</Target>

</Project>

0 comments on commit 0202a8b

Please sign in to comment.