Switch to Arcade UnitTest targets and props

dotnet · Jul 29, 2020 · aabdb0e · aabdb0e
1 parent 071c4f4
commit aabdb0e
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 219 deletions.
diff --git a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.props
@@ -1,5 +1,5 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
-<Project>  
+<Project>
   <PropertyGroup>
     <NoWarn>$(NoWarn);NU5125;NU3005</NoWarn>
 
@@ -8,16 +8,12 @@
   </PropertyGroup>
 
   <!-- Recognize MSTest projects -->
-  <PropertyGroup Condition="'$(IsUnitTestProject)' == '' and ($(MSBuildProjectName.EndsWith('.MSTest.UnitTests')) or $(MSBuildProjectName.EndsWith('.MSTest.Tests')))">
-    <IsUnitTestProject>true</IsUnitTestProject>
-    <UsingToolXUnit>false</UsingToolXUnit>
+  <PropertyGroup Condition="'$(TestRunnerName)' == '' and ($(MSBuildProjectName.EndsWith('.MSTest.UnitTests')) or $(MSBuildProjectName.EndsWith('.MSTest.Tests')))">
     <TestRunnerName>MSTest</TestRunnerName>
   </PropertyGroup>
 
   <!-- Recognize NUnit projects -->
-  <PropertyGroup Condition="'$(IsUnitTestProject)' == '' and ($(MSBuildProjectName.EndsWith('.NUnit.UnitTests')) or $(MSBuildProjectName.EndsWith('.NUnit.Tests')))">
-    <IsUnitTestProject>true</IsUnitTestProject>
-    <UsingToolXUnit>false</UsingToolXUnit>
+  <PropertyGroup Condition="'$(TestRunnerName)' == '' and ($(MSBuildProjectName.EndsWith('.NUnit.UnitTests')) or $(MSBuildProjectName.EndsWith('.NUnit.Tests')))">
     <TestRunnerName>NUnit</TestRunnerName>
   </PropertyGroup>
 
@@ -37,9 +33,6 @@
     <NUnit3TestAdapterVersion Condition="'$(NUnit3TestAdapterVersion)' == ''">3.15.1</NUnit3TestAdapterVersion>
   </PropertyGroup>
 
-  <!-- Import specialized props files of supported test runners -->
-  <Import Project="$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).props" Condition="'$(TestRunnerName)' != '' and Exists('$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).props')"/>
-
   <PropertyGroup>
     <TestTargetFrameworks>netcoreapp3.1;net472;net46;netcoreapp1.1;netcoreapp2.0</TestTargetFrameworks>
 
@@ -71,7 +64,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\..\RoslynSDK.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  
+
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersVersion)" PrivateAssets="all" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\..\stylecop.json" Link="stylecop.json" />

diff --git a/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets b/tests/Microsoft.CodeAnalysis.Testing/Directory.Build.targets
@@ -1,11 +1,8 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <ItemGroup Condition="'$(UsingToolXUnit)' == 'true' and '$(IsUnitTestProject)' == 'true'">
+  <ItemGroup Condition="'$(TestRunnerName)' == 'XUnit' and '$(IsUnitTestProject)' == 'true'">
     <PackageReference Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
   </ItemGroup>
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
-
-  <!-- Import specialized targets files of supported test runners -->
-  <Import Project="$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).targets" Condition="'$(TestRunnerName)' != '' and Exists('$(MSBuildThisFileDirectory)tools\$(TestRunnerName)\$(TestRunnerName).targets')"/>
 </Project>
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.props b/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.props
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.targets b/tests/Microsoft.CodeAnalysis.Testing/tools/MSTest/MSTest.targets
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.props b/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.props
diff --git a/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.targets b/tests/Microsoft.CodeAnalysis.Testing/tools/NUnit/NUnit.targets
diff --git a/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets b/tests/VisualStudio.Roslyn.SDK/Directory.Build.targets
@@ -1,6 +1,6 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE file in the project root for more information. -->
 <Project>
-  <ItemGroup Condition="'$(UsingToolXUnit)' == 'true' and '$(IsUnitTestProject)' == 'true'">
+  <ItemGroup Condition="'$(TestRunnerName)' == 'XUnit' and '$(IsUnitTestProject)' == 'true'">
     <PackageReference Include="Xunit.Combinatorial" Version="$(XunitCombinatorialVersion)" />
   </ItemGroup>