Update and reference xunit from stable feed (dotnet/corefx#31974)

* Reference xunit from stable feed

* Update XUnitRunnerUap

* Fix flaky uap culture change

Commit migrated from https://github.com/dotnet/corefx/commit/6b762eedf224de6f38a37b96104ecb146f41a122

diff --git a/src/libraries/System.Runtime/tests/System/StringTests.netcoreapp.cs b/src/libraries/System.Runtime/tests/System/StringTests.netcoreapp.cs
index 52f088e..36a6cec 100644 (file)
--- a/src/libraries/System.Runtime/tests/System/StringTests.netcoreapp.cs
+++ b/src/libraries/System.Runtime/tests/System/StringTests.netcoreapp.cs
@@ -470,6 +470,11 @@ namespace System.Tests
                 Assert.Equal("\u0069a", source.Replace("\u0130", "a", StringComparison.CurrentCulture));
                 Assert.Equal("aa", source.Replace("\u0130", "a", StringComparison.CurrentCultureIgnoreCase));
 
+                return SuccessExitCode;
+            }, src).Dispose();
+
+            RemoteInvoke((source) =>
+            {
                 CultureInfo.CurrentCulture = new CultureInfo("en-US");
 
                 Assert.False("\u0069".Equals("\u0130", StringComparison.CurrentCultureIgnoreCase));
@@ -480,7 +485,7 @@ namespace System.Tests
                 Assert.Equal("\u0069a", source.Replace("\u0130", "a", StringComparison.CurrentCultureIgnoreCase));
 
                 return SuccessExitCode;
-            }, src).Dispose();
+            }, src).Dispose();                            
         }
 
         public static IEnumerable<object[]> Replace_StringComparisonCulture_TestData()

diff --git a/src/libraries/dependencies.props b/src/libraries/dependencies.props
index b25177c..fdc4aa8 100644 (file)
--- a/src/libraries/dependencies.props
+++ b/src/libraries/dependencies.props
@@ -47,11 +47,11 @@
 
     <!-- xunit test dependency version  -->
     <MicrosoftDotNetTestSdkVersion>15.8.0</MicrosoftDotNetTestSdkVersion>
-    <XUnitPackageVersion>2.4.1-alpha.1.build4054</XUnitPackageVersion>
+    <XUnitPackageVersion>2.4.1-pre.build.4059</XUnitPackageVersion>
     <XUnitPerformancePackageVersion>1.0.0-beta-build0020</XUnitPerformancePackageVersion>
     <TraceEventPackageVersion>2.0.5</TraceEventPackageVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>2.4.0-beta.18420.3</MicrosoftDotNetXUnitExtensionsVersion>
-    <UAPToolsPackageVersion>1.0.19</UAPToolsPackageVersion>
+    <UAPToolsPackageVersion>1.0.21</UAPToolsPackageVersion>
 
     <!-- Roslyn optimization data package version -->
     <MicrosoftDotNetIBCMergePackageVersion>4.6.0-alpha-00001</MicrosoftDotNetIBCMergePackageVersion>