From 951d2b6a616ba9d5d1ab1609a1bbdf257bc28f64 Mon Sep 17 00:00:00 2001
From: Egor Chesakov <Egor.Chesakov@microsoft.com>
Date: Tue, 16 Apr 2019 09:49:38 -0700
Subject: [PATCH] Downgrade xUnit package version (dotnet/coreclr#23944)

* Use the same version of xUnit that arcade uses (2.4.1-pre.build.4059)


Commit migrated from https://github.com/dotnet/coreclr/commit/8252365bfb7651a5473e98d3bdaeaa8cb22c0ec3
---
 src/coreclr/build-test.sh      | 3 +--
 src/coreclr/dependencies.props | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
index b6224a4..93a1980 100755
--- a/src/coreclr/build-test.sh
+++ b/src/coreclr/build-test.sh
@@ -176,8 +176,7 @@ precompile_coreroot_fx()
 
     local overlayDir=$CORE_ROOT
 
-    # TODO: Remove System.Xml.XDocument.dll exclusion - it was added because "custom" xunit.console.dll fails when running from Core_Root with crossgen-d framework.
-    filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -not -iname xunit.\* -not -name System.Xml.XDocument.dll -type f)
+    filesToPrecompile=$(find -L $overlayDir -iname \*.dll -not -iname \*.ni.dll -not -iname \*-ms-win-\* -not -iname xunit.\* -type f)
     for fileToPrecompile in ${filesToPrecompile}
     do
         local filename=${fileToPrecompile}
diff --git a/src/coreclr/dependencies.props b/src/coreclr/dependencies.props
index a729944..351914f 100644
--- a/src/coreclr/dependencies.props
+++ b/src/coreclr/dependencies.props
@@ -33,7 +33,7 @@
   <!-- Tests/infrastructure dependency versions. -->
   <PropertyGroup>
     <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-preview5-27615-71</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <XunitPackageVersion>2.4.1</XunitPackageVersion>
+    <XunitPackageVersion>2.4.1-pre.build.4059</XunitPackageVersion>
     <XunitPerformanceApiPackageVersion>1.0.0-beta-build0015</XunitPerformanceApiPackageVersion>
     <MicrosoftDiagnosticsTracingTraceEventPackageVersion>2.0.36</MicrosoftDiagnosticsTracingTraceEventPackageVersion>
     <IbcMergePackageVersion>4.6.0-alpha-00001</IbcMergePackageVersion>
-- 
2.7.4