From 243b5ed54b5ca63a5e475230732730e50a74c570 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 16 Nov 2019 17:23:52 +0100
Subject: [PATCH] Use xunit runner fork in coreclr

---
 src/coreclr/dependencies.props             | 44 ----------------------
 src/coreclr/tests/external/external.csproj | 22 +++++------
 src/coreclr/tests/scripts/scripts.csproj   |  4 +-
 src/coreclr/tests/src/runtest.proj         |  4 +-
 4 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index bdc7658893e2bd..ee1a80d71879e8 100644
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -8,7 +8,6 @@
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
     <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview6.19280.1</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.43</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <MicrosoftDiagnosticsToolsRuntimeClientVersion>1.0.4-preview6.19326.1</MicrosoftDiagnosticsToolsRuntimeClientVersion>
@@ -42,49 +41,6 @@
       <ElementName>MicrosoftNETCoreRuntimeCoreCLRPackageVersion</ElementName>
       <PackageId>Microsoft.NETCore.Runtime.CoreCLR</PackageId>
     </XmlUpdateStep>
-    <UpdateStep Include="ILAsm">
-      <UpdaterType>File</UpdaterType>
-      <Path>$(MSBuildThisFileDirectory)ILAsmVersion.txt</Path>
-      <PackageId>Microsoft.NETCore.ILAsm</PackageId>
-    </UpdateStep>
-  </ItemGroup>
-
-  <!-- Set up dependencies on packages that aren't found in a BuildInfo. -->
-  <ItemGroup>
-    <XUnitDependency Include="xunit"/>
-    <XUnitDependency Include="xunit.assert"/>
-    <XUnitDependency Include="xunit.core"/>
-    <XUnitDependency Include="xunit.extensibility.core" />
-    <XUnitDependency Include="xunit.runner.console"/>
-    <XUnitDependency Include="xunit.runner.msbuild"/>
-    <XUnitDependency Include="xunit.runner.utility"/>
-    <StaticDependency Include="@(XUnitDependency)">
-      <Version>$(XunitPackageVersion)</Version>
-    </StaticDependency>
-
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.analysis.cli" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.metrics" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.run.core" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.cli" />
-    <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.Windows" />
-    <StaticDependency Include="@(XunitPerformanceDependency)">
-      <Version>1.0.0-alpha-build0040</Version>
-    </StaticDependency>
-
-    <XUnitPerformanceApiDependency Include="xunit.performance.api" />
-    <XUnitPerformanceApiDependency Include="xunit.performance.core" />
-    <XUnitPerformanceApiDependency Include="xunit.performance.execution" />
-    <XUnitPerformanceApiDependency Include="xunit.performance.metrics" />
-    <StaticDependency Include="@(XUnitPerformanceApiDependency)">
-      <Version>$(XunitPerformanceApiPackageVersion)</Version>
-    </StaticDependency>
-
-    <DependencyBuildInfo Include="@(StaticDependency)">
-      <PackageId>%(Identity)</PackageId>
-      <UpdateStableVersions>true</UpdateStableVersions>
-    </DependencyBuildInfo>
   </ItemGroup>
 
   <!-- Override isolated build dependency versions with versions from Repo API. -->
diff --git a/src/coreclr/tests/external/external.csproj b/src/coreclr/tests/external/external.csproj
index 6583060a74ca9b..361b1c57fa87d6 100644
--- a/src/coreclr/tests/external/external.csproj
+++ b/src/coreclr/tests/external/external.csproj
@@ -16,8 +16,7 @@
     <NuGetTargetMoniker>.NETCoreApp,Version=v3.0</NuGetTargetMoniker>
     <NuGetTargetMonikerShort>netcoreapp3.0</NuGetTargetMonikerShort>
     <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
-    <XUnitRunnerPackageId>xunit.runner.console</XUnitRunnerPackageId>
-    <XUnitRunnerTargetFramework>netcoreapp2.0</XUnitRunnerTargetFramework>
+    <XUnitRunnerTargetFramework>netcoreapp2.1</XUnitRunnerTargetFramework>
     <CLRTestKind>SharedLibrary</CLRTestKind>
     <IsTestProject>false</IsTestProject>
     <GenerateDependencyFile>false</GenerateDependencyFile>
@@ -78,23 +77,20 @@
     <PackageReference Include="xunit.performance.metrics" Version="$(XunitPerformanceApiPackageVersion)" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent" Version="$(MicrosoftDiagnosticsTracingTraceEventPackageVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.console" Version="$(XunitPackageVersion)" GeneratePathProperty="True" />
-    <PackageReference Include="xunit.runner.utility" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" GeneratePathProperty="True" />
+    <PackageReference Include="xunit.runner.utility" Version="$(XUnitVersion)" />
   </ItemGroup>
 
   <Target Name="AddXunitConsoleRunner" BeforeTargets="ResolveReferences">
-    <Error Condition="!Exists('$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
-            Text="Error: looks the package $(Pkgxunit_runner_console) not restored or missing xunit.console.dll."
+    <Error Condition="!Exists('$(PkgMicrosoft_DotNet_XunitConsoleRunner)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll')"
+            Text="Error: looks the package $(PkgMicrosoft_DotNet_XunitConsoleRunner) not restored or missing xunit.console.dll."
     />
     <ItemGroup>
-      <ReferenceCopyLocalPaths
-        Include="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\*.*"
-        Exclude="$(Pkgxunit_runner_console)\tools\$(XUnitRunnerTargetFramework)\xunit.console.dll.config"
-      >
+      <ReferenceCopyLocalPaths Include="$(PkgMicrosoft_DotNet_XunitConsoleRunner)\tools\$(XUnitRunnerTargetFramework)\*.*">
         <Private>false</Private>
-        <NuGetPackageId>$(XUnitRunnerPackageId)</NuGetPackageId>
-        <NuGetPackageVersion>$(XUnitPackageVersion)</NuGetPackageVersion>
+        <NuGetPackageId>$(MicrosoftDotNetXUnitConsoleRunnerPackage)</NuGetPackageId>
+        <NuGetPackageVersion>$(MicrosoftDotNetXUnitConsoleRunnerVersion)</NuGetPackageVersion>
       </ReferenceCopyLocalPaths>
     </ItemGroup>
   </Target>
diff --git a/src/coreclr/tests/scripts/scripts.csproj b/src/coreclr/tests/scripts/scripts.csproj
index 7a632012053e39..57d5a035ea44dc 100644
--- a/src/coreclr/tests/scripts/scripts.csproj
+++ b/src/coreclr/tests/scripts/scripts.csproj
@@ -14,8 +14,8 @@
     <PackageReference Include="Microsoft.DotNet.xunit.performance">
       <Version>1.0.0-alpha-build0040</Version>
     </PackageReference>
-    <PackageReference Include="xunit.runner.console">
-      <Version>$(XunitPackageVersion)</Version>
+    <PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)">
+      <Version>$(MicrosoftDotNetXUnitConsoleRunnerVersion)</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.DotNet.BuildTools.TestSuite">
       <Version>1.0.0-prerelease-00629-04</Version>
diff --git a/src/coreclr/tests/src/runtest.proj b/src/coreclr/tests/src/runtest.proj
index 0736ac725b3c05..18549b9f203ae2 100644
--- a/src/coreclr/tests/src/runtest.proj
+++ b/src/coreclr/tests/src/runtest.proj
@@ -108,8 +108,8 @@ $(_XunitEpilog)
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="xunit" Version="$(XunitPackageVersion)" />
-    <PackageReference Include="xunit.runner.console" Version="$(XunitPackageVersion)" />
+    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
+    <PackageReference Include="$(MicrosoftDotNetXUnitConsoleRunnerPackage)" Version="$(MicrosoftDotNetXUnitConsoleRunnerVersion)" />
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />