Create general TestAssembly target

- rename WebStack.xunit.targets -> WebStack.testing.targets
- rename `Xunit` target -> `TestAssembly`
- move `dotnet vstest` use into new target
  - handle exit codes more consistently

Author: dougbu

Runtime.msbuild

@@ -102,32 +102,30 @@
   <Target Name="RunTests" DependsOnTargets="CheckSkipStrongNames">
     <ItemGroup>
       <_TestDLLsXunit Include="bin\$(Configuration)\test\*.Test.dll" />
-      <_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll" Condition="'$(BuildPortable)' == 'true'" />
-      <_XunitProject Include="tools\WebStack.xunit.targets">
-        <Properties>TestAssembly=%(_TestDLLsXunit.FullPath);XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
+      <_TestDLLsXunit Include="bin\$(Configuration)\test\*\net4*\*.Test.dll"
+          Condition=" '$(BuildPortable)' == 'true' " />
+      <_XunitProject Include="tools\WebStack.testing.targets">
+        <Properties>TestAssembly=%(_TestDLLsXunit.FullPath);
+          XmlPath=$(TestResultsDirectory)%(_TestDLLsXunit.FileName)-XunitResults.xml</Properties>
       </_XunitProject>
 
-      <_VSTestDLLs Include="bin\$(Configuration)\test\*\netcoreapp*\*.Test.dll" />
-    </ItemGroup>
-    <ItemGroup>
-      <_VSTestDLLs>
-        <TestResultsPath>$(TestResultsDirectory)%(FileName)-NetCoreApp-XunitResults.xml</TestResultsPath>
-      </_VSTestDLLs>
+      <_VSTestDLLs Include="bin\$(Configuration)\test\*\netcoreapp*\*.Test.dll"
+          Condition=" '$(BuildPortable)' == 'true' "/>
+      <_XunitProject Include="tools\WebStack.testing.targets"
+          Condition=" '$(BuildPortable)' == 'true' ">
+        <Properties>TestAssembly=%(_VSTestDLLs.FullPath);
+          XmlPath=$(TestResultsDirectory)%(_VSTestDLLs.FileName)-NetCoreApp-XunitResults.xml;
+          UseVSTest=true</Properties>
+      </_XunitProject>
     </ItemGroup>
 
     <!-- Recreate the test results directory so that print summary doesn't run on old test results. -->
     <RemoveDir Directories="$(TestResultsDirectory)" />
     <MakeDir Directories="$(TestResultsDirectory)" />
 
-    <MSBuild Projects="@(_XunitProject)" BuildInParallel="$(TestInParallel)" Targets="Xunit">
+    <MSBuild Projects="@(_XunitProject)" BuildInParallel="$(TestInParallel)" Targets="TestAssembly">
       <Output TaskParameter="TargetOutputs" ItemName="_ExitCodes" />
     </MSBuild>
-
-    <Exec Command="dotnet vstest @(_VSTestDLLs) --logger:&quot;xunit;LogFilePath=%(_VSTestDLLs.TestResultsPath)&quot;"
-        Condition=" '$(BuildPortable)' == 'true' "
-        IgnoreExitCode="true">
-      <Output TaskParameter="ExitCode" ItemName="_VSTestErrorCode" />
-    </Exec>
   </Target>
 
   <Target Name="CheckSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">

tools/WebStack.xunit.targets renamed to tools/WebStack.testing.targets

@@ -5,10 +5,19 @@
   -->
   <Import Project="..\packages\**\xunit.runner.msbuild.props"/>
 
-  <Target Name="Xunit" Returns="@(_ExitCodes)">
-    <xunit Assemblies="$(TestAssembly)" Xml="$(XmlPath)" IgnoreFailures="true">
+  <Target Name="TestAssembly" Returns="@(_ExitCodes)">
+    <xunit Assemblies="$(TestAssembly)"
+        Condition=" '$(UseVSTest)' != 'true' "
+        IgnoreFailures="true"
+        Xml="$(XmlPath)">
       <Output TaskParameter="ExitCode" PropertyName="_ExitCode" />
     </xunit>
+    <Exec Command="dotnet vstest $(TestAssembly) --logger:&quot;xunit;LogFilePath=$(XmlPath)&quot;"
+        Condition=" '$(UseVSTest)' == 'true' "
+        IgnoreExitCode="true"
+        IgnoreStandardErrorWarningFormat="true">
+      <Output TaskParameter="ExitCode" PropertyName="_ExitCode" />
+    </Exec>
 
     <ItemGroup>
       <_ExitCodes Include="$(TestAssembly)" Code="$(_ExitCode)" />