RunVSTest: Avoid running tests a second time when running under dotnet (

#549)
microsoft · Mar 29, 2024 · 92b330e · 92b330e
1 parent 787e846
commit 92b330e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/src/RunTests/build/Microsoft.Build.RunVSTest.targets b/src/RunTests/build/Microsoft.Build.RunVSTest.targets
@@ -5,8 +5,10 @@
   Licensed under the MIT license.
 -->
 <Project>
-  <UsingTask TaskName="Microsoft.Build.RunVSTestTask" AssemblyFile="$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.RunVSTest.dll" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'"/>
-  <Target Name="RunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' != 'Core'">
+  <UsingTask TaskName="Microsoft.Build.RunVSTestTask" AssemblyFile="$(MSBuildThisFileDirectory)netstandard2.0\Microsoft.Build.RunVSTest.dll" />
+
+  <!-- Only consider non "dotnet" scenarios sinces those are already covered by Microsoft.Testing.Platform.MSBuild, which is automatically included as a dependency of MSTest.TestAdapter -->
+  <Target Name="RunVSTest" AfterTargets="Test" Condition="'$(RunVSTest)' != 'false' and '$(IsTestProject)' == 'true' and '$(MSBuildRuntimeType)' != 'Core'">
     <RunVSTestTask ToolExe="$(VSTestToolExe)"
                    ToolPath="$(VSTestToolPath)"
                    TestFileFullPath="$(TargetPath)"
@@ -33,7 +35,4 @@
                    VSTestArtifactsProcessingMode="$(VSTestArtifactsProcessingMode)"
                    VSTestSessionCorrelationId="$(VSTestSessionCorrelationId)" />
   </Target>
-  <Target Name="ForceRunVSTest" AfterTargets="Test" Condition="'$(IsTestProject)' == 'true' and '$(MSBuildRuntime)' == 'Core'" >
-    <CallTarget Targets="VSTest" />
-  </Target>
 </Project>