From df5c90ae20567f84632ffdd317d5c9bdd27343f6 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 18 Mar 2020 16:01:28 +0100
Subject: [PATCH] Make VSTest runner work and enable html log

The VSTest runner is now supposed to work with the /p:TestRunner=vstest
switch. Currently this is an opt-in but the desire is to get rid of
xunit.console completely and just use VSTest.
---
 eng/Versions.props                                   |  1 -
 eng/testing/xunit/vstest.props                       | 12 ++++--------
 eng/testing/xunit/vstest.targets                     | 10 +++++++---
 eng/testing/xunit/vstest.xunit.json                  |  5 +++++
 .../xunit/{xunit.runner.json => xunit.console.json}  |  0
 eng/testing/xunit/xunit.console.props                |  2 ++
 eng/testing/xunit/xunit.console.targets              |  5 -----
 eng/testing/xunit/xunit.props                        |  2 --
 eng/testing/xunit/xunit.targets                      |  7 +++++++
 global.json                                          |  2 +-
 10 files changed, 26 insertions(+), 20 deletions(-)
 create mode 100644 eng/testing/xunit/vstest.xunit.json
 rename eng/testing/xunit/{xunit.runner.json => xunit.console.json} (100%)

diff --git a/eng/Versions.props b/eng/Versions.props
index 675ca6daff79c5..3f17b5615f1551 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -118,7 +118,6 @@
     <XUnitVersion>2.4.1</XUnitVersion>
     <TraceEventVersion>2.0.5</TraceEventVersion>
     <NewtonsoftJsonVersion>12.0.3</NewtonsoftJsonVersion>
-    <XUnitXmlTestLoggerVersion>2.1.26</XUnitXmlTestLoggerVersion>
     <MoqVersion>4.12.0</MoqVersion>
     <!-- Docs -->
     <MicrosoftPrivateIntellisenseVersion>3.1.0-preview-20200129.1</MicrosoftPrivateIntellisenseVersion>
diff --git a/eng/testing/xunit/vstest.props b/eng/testing/xunit/vstest.props
index bcf5476a827173..0cc370f2761714 100644
--- a/eng/testing/xunit/vstest.props
+++ b/eng/testing/xunit/vstest.props
@@ -2,19 +2,15 @@
   <PropertyGroup>
     <!-- Microsoft.Net.Test.Sdk brings a lot of satellite assemblies in. -->
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>
+    <TrxTestResultsName>testResults.trx</TrxTestResultsName>
+    <HtmlTestResultsName>testResults.html</HtmlTestResultsName>
+    <TestResultsName>$(HtmlTestResultsName)</TestResultsName>
+    <TestRunnerConfigPath>$(MSBuildThisFileDirectory)vstest.xunit.json</TestRunnerConfigPath>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" />
-    <PackageReference Include="XunitXml.TestLogger" Version="$(XUnitXmlTestLoggerVersion)" />
-
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
   </ItemGroup>
-
-  <ItemGroup>
-    <None Include="$(TestRunnerConfigPath)"
-          CopyToOutputDirectory="PreserveNewest"
-          Visible="false" />
-  </ItemGroup>
 </Project>
diff --git a/eng/testing/xunit/vstest.targets b/eng/testing/xunit/vstest.targets
index 9e1517a2bf648e..326a7cda00bc1e 100644
--- a/eng/testing/xunit/vstest.targets
+++ b/eng/testing/xunit/vstest.targets
@@ -1,10 +1,13 @@
 <Project>
   <PropertyGroup>
-    <RunCommand>"$(RunScriptHost)"</RunCommand>
+    <RunCommand>"$(DotNetTool)"</RunCommand>
+    <RunCommand Condition="'$(ContinuousIntegrationBuild)' == 'true'">dotnet</RunCommand>
     <RunArguments>test $(TargetFileName)</RunArguments>
 
     <!-- CLI options -->
-    <RunArguments>$(RunArguments) --logger "xunit;LogFilePath=$(TestResultsName)"</RunArguments>
+    <RunArguments>$(RunArguments) --nologo</RunArguments>
+    <RunArguments>$(RunArguments) --logger "trx;LogFileName=$(TrxTestResultsName)"</RunArguments>
+    <RunArguments>$(RunArguments) --logger "html;LogFileName=$(HtmlTestResultsName)"</RunArguments>
     <RunArguments>$(RunArguments) --framework $(TargetFramework)</RunArguments>
     <RunArguments>$(RunArguments) --platform $(ArchGroup)</RunArguments>
     <RunArguments Condition="'$(TestDisableParallelization)' != 'true'">$(RunArguments) --parallel</RunArguments>
@@ -27,6 +30,7 @@
     <!-- RunConfiguration settings. -->
     <RunSettingsOptions Condition="'$(TestDisableParallelization)' == 'true'">$(RunSettingsOptions) RunConfiguration.DisableParallelization=true</RunSettingsOptions>
     <RunSettingsOptions Condition="'$(TestDisableAppDomain)' == 'true'">$(RunSettingsOptions) RunConfiguration.DisableAppDomain=true</RunSettingsOptions>
-    <RunArguments Condition="'$(RunSettingsOptions)' != ''">$(RunArguments)  --(RunSettingsOptions)</RunArguments>
+    <RunSettingsOptions>$(RunSettingsOptions) RunConfiguration.DotNetHostPath="$(RunScriptHost)"</RunSettingsOptions>
+    <RunArguments>$(RunArguments) --$(RunSettingsOptions)</RunArguments>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/eng/testing/xunit/vstest.xunit.json b/eng/testing/xunit/vstest.xunit.json
new file mode 100644
index 00000000000000..b81a78d00ad56e
--- /dev/null
+++ b/eng/testing/xunit/vstest.xunit.json
@@ -0,0 +1,5 @@
+{
+    "diagnosticMessages": false,
+    "longRunningTestSeconds": 120,
+    "shadowCopy": false
+}
\ No newline at end of file
diff --git a/eng/testing/xunit/xunit.runner.json b/eng/testing/xunit/xunit.console.json
similarity index 100%
rename from eng/testing/xunit/xunit.runner.json
rename to eng/testing/xunit/xunit.console.json
diff --git a/eng/testing/xunit/xunit.console.props b/eng/testing/xunit/xunit.console.props
index 2911134a182156..ad7ffdb52587fd 100644
--- a/eng/testing/xunit/xunit.console.props
+++ b/eng/testing/xunit/xunit.console.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <TestResultsName>testResults.xml</TestResultsName>
+    <TestRunnerConfigPath>$(MSBuildThisFileDirectory)xunit.console.json</TestRunnerConfigPath>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/testing/xunit/xunit.console.targets b/eng/testing/xunit/xunit.console.targets
index b474bbf6a2e1e5..059eede7dcf42b 100644
--- a/eng/testing/xunit/xunit.console.targets
+++ b/eng/testing/xunit/xunit.console.targets
@@ -52,11 +52,6 @@
   <!-- ResolveAssemblyReferences is the target that populates ReferenceCopyLocalPaths which is what is copied to output directory. -->
   <Target Name="CopyRunnerToOutputDirectory" BeforeTargets="ResolveAssemblyReferences">
     <ItemGroup>
-      <!-- Add the runner configuration file -->
-      <None Include="$(TestRunnerConfigPath)"
-            CopyToOutputDirectory="PreserveNewest"
-            Visible="false" />
-
       <!-- Copy test runner to output directory -->
       <None Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\*"
             Exclude="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.*exe.config;$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))\xunit.console.x86.exe"
diff --git a/eng/testing/xunit/xunit.props b/eng/testing/xunit/xunit.props
index 2282ba79caa905..0b6289b9a22669 100644
--- a/eng/testing/xunit/xunit.props
+++ b/eng/testing/xunit/xunit.props
@@ -1,8 +1,6 @@
 <Project>
   <PropertyGroup>
     <TestRunner Condition="'$(TestRunner)' == ''">xunit.console</TestRunner>
-    <TestRunnerConfigPath>$(MSBuildThisFileDirectory)xunit.runner.json</TestRunnerConfigPath>
-    <TestResultsName>testResults.xml</TestResultsName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/testing/xunit/xunit.targets b/eng/testing/xunit/xunit.targets
index 81627d6bc14d35..4583d682cfb705 100644
--- a/eng/testing/xunit/xunit.targets
+++ b/eng/testing/xunit/xunit.targets
@@ -23,6 +23,13 @@
     <_withoutCategories Condition="'$(TargetOSCategory)' != ''">$(_withoutCategories);$(TargetOSCategory)</_withoutCategories>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(TestRunnerConfigPath)"
+          Link="xunit.runner.json"
+          CopyToOutputDirectory="PreserveNewest"
+          Visible="false" />
+  </ItemGroup>
+
   <Target Name="ValidateTargetOSCategory"
           BeforeTargets="GenerateRunScript">
     <Error Condition="'$(TargetOSCategory)' == ''"
diff --git a/global.json b/global.json
index d3834c617f6cef..a0aa5f014d303a 100644
--- a/global.json
+++ b/global.json
@@ -5,7 +5,7 @@
     "rollForward": "major"
   },
   "tools": {
-    "dotnet": "5.0.100-preview.3.20168.11"
+    "dotnet": "5.0.100-preview.3.20170.6"
   },
   "native-tools": {
     "cmake": "3.14.2",