Add validation target to avoid losing test coverage with merged test wrappers (#66951)

Co-authored-by: Bruce Forstall <brucefo@microsoft.com>

diff --git a/src/tests/Common/mergedrunner.targets b/src/tests/Common/mergedrunner.targets
new file mode 100644 (file)
index 0000000..8d67c62
--- /dev/null
+++ b/src/tests/Common/mergedrunner.targets
@@ -0,0 +1,16 @@
+<Project>
+  <Target Name="_ValidateNoTestProjectsDroppedByConflictResolution" AfterTargets="ResolveReferences">
+    <ItemGroup>
+      <_ProjectReferencesUsedByReferencePaths Include="@(ReferencePath->Metadata('ProjectReferenceOriginalItemSpec'))" />
+      <_ProjectAssemblyReferences Include="@(ProjectReference)" Condition="'%(ProjectReference.OutputItemType)' == ''" />
+      <_ProjectReferencesRemovedDueToConflictResolution Include="@(_ProjectAssemblyReferences)" Exclude="@(_ProjectReferencesUsedByReferencePaths)" />
+    </ItemGroup>
+    <!--
+      Produce an error if any project references were removed due to conflict resolution.
+      If a ProjectReference is removed due to conflict resolution, then we're likely losing test coverage as it's probably a test that has the same assembly name and version as another test.
+    -->
+    <Error Text="@(_ProjectReferencesRemovedDueToConflictResolution->'This project has an assembly name identical to another project: %(FullPath)', '&#010;')" Condition="'@(_ProjectReferencesRemovedDueToConflictResolution)' != ''"  />
+  </Target>
+  
+  <Import Project="$(RepoRoot)/src/tests/Common/mergedrunnermobile.targets" Condition="'$(TargetsMobile)' == 'true'" />
+</Project>
\ No newline at end of file

diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets
index 83fc083..bc9091d 100644 (file)
--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -462,7 +462,7 @@
   <Import Project="$(RepoRoot)/src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.props" />
   <Import Project="$(RepoRoot)eng/liveBuilds.targets" />
   <Import Project="$(MSBuildProjectFullPath).targets" Condition="Exists('$(MSBuildProjectFullPath).targets')"/>
-  <Import Project="$(RepoRoot)/src/tests/Common/mergedrunnermobile.targets" Condition="'$(IsMergedTestRunnerAssembly)' == 'true' and '$(TargetsMobile)' == 'true'" />
+  <Import Project="$(RepoRoot)/src/tests/Common/mergedrunner.targets" Condition="'$(IsMergedTestRunnerAssembly)' == 'true'" />
 
   <Target Name="GetBinPlaceTargetFramework" />