diff --git a/eng/testing/xunit/xunit.console.v3.targets b/eng/testing/xunit/xunit.console.v3.targets
new file mode 100644
index 00000000000000..c26883aaf6b750
--- /dev/null
+++ b/eng/testing/xunit/xunit.console.v3.targets
@@ -0,0 +1,50 @@
+
+
+
+ true
+ testResults.xml
+ true
+
+
+
+
+
+
+
+
+ <_depsFileArgument Condition="'$(GenerateDependencyFile)' == 'true'">--depsfile $(AssemblyName).deps.json
+ "$(RunScriptHost)" exec --runtimeconfig $(AssemblyName).runtimeconfig.json $(_depsFileArgument) $(TargetFileName)
+ ./$(AssemblyName)
+ $(AssemblyName).exe
+
+ $(RunScriptCommand) -xml $(TestResultsName)
+ $(RunScriptCommand) -noLogo
+ $(RunScriptCommand) -noColor
+ $(RunScriptCommand) -noappdomain
+ $(RunScriptCommand) -maxThreads 1
+ $(RunScriptCommand) -reporter verbose
+
+
+
+
+ $(RunScriptCommand) -method $(XUnitMethodName)
+ $(RunScriptCommand) -class $(XUnitClassName)
+
+
+ $(RunScriptCommand)$(_withCategories.Replace(';', ' -trait category='))
+ $(RunScriptCommand)$(_withoutCategories.Replace(';', ' -trait- category='))
+
+
+ $(RunScriptCommand) $(XUnitOptions)
+
+
+
+ $(_withoutCategories.Replace(';', '%0dcategory='))
+
+
+
+
+ $(RunScriptCommand) -xml $(TestResultsName)
+
+
+
diff --git a/eng/testing/xunit/xunit.props b/eng/testing/xunit/xunit.props
index 47148592eedff2..92b2a2d9c18b67 100644
--- a/eng/testing/xunit/xunit.props
+++ b/eng/testing/xunit/xunit.props
@@ -3,6 +3,7 @@
en
$(MSBuildThisFileDirectory)xunit.runner.json
+ Exe
$(NoWarn);xUnit1051
@@ -10,13 +11,16 @@
-
+
+
-
-
+
+
+
-
+
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.XUnitV3.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.XUnitV3.csproj
new file mode 100644
index 00000000000000..37d3829cb44f96
--- /dev/null
+++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.XUnitV3.csproj
@@ -0,0 +1,16 @@
+
+
+ TestUtilities
+ TestUtilities
+ $(DefineConstants);XUNIT_V3
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
index e29f6f24e3633a..fe2b4dfde0ecd3 100644
--- a/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
+++ b/src/libraries/Common/tests/TestUtilities/TestUtilities.csproj
@@ -1,109 +1,5 @@
-
- $(NetCoreAppMinimum);$(NetFrameworkCurrent)
- true
-
- false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -115,13 +11,7 @@
-
-
-
-
-
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index b85797ae211c21..351957fc8ed1fd 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -79,8 +79,27 @@
$([MSBuild]::NormalizeDirectory('$(CommonPathRoot)', 'tests'))
+
+
+
+ System.Collections.Tests;
+
+ true
+
+
-
+
+
diff --git a/src/libraries/System.Collections/tests/Generic/Comparers/EqualityComparer.Tests.cs b/src/libraries/System.Collections/tests/Generic/Comparers/EqualityComparer.Tests.cs
index b45874cd3e3f31..43f935d69ad2bf 100644
--- a/src/libraries/System.Collections/tests/Generic/Comparers/EqualityComparer.Tests.cs
+++ b/src/libraries/System.Collections/tests/Generic/Comparers/EqualityComparer.Tests.cs
@@ -16,8 +16,8 @@ public IEnumerable Items
{
get
{
- return this.Select(array => array[0])
- .Concat(this.Select(array => array[1]))
+ return this.Select(row => row.Data.Item1)
+ .Concat(this.Select(row => row.Data.Item2))
.Cast();
}
}