Upgrade xunit version to avoid specialized restore

Upgrade xunit from 2.1.0 to 2.2.0-beta2-build3300.

Restore xunit.runner.msbuild during normal test build.

Remove unused reference to xunit 2.1.0.

Replace "2.1.0" with "$(XunitPackageVersion)" for direct path to files.

Upgrade xunit used by GCPerfTestFramework and fix helix path.

Upgrade Microsoft.DotNet.xunit.performance and Microsoft.DotNet.xunit.performance.metrics to 1.0.0-alpha-build0040.

Upgrade XunitPerformanceDependency packages to 1.0.0-alpha-build0040.

Include scripts project.json in validation, update them.

Don't use helix.targets in generated xunit wrappers.

Copy TestTFM defaulting logic from CoreFX dir.props. Tweak default wrapper TFM per platform, and use real RID instead of relying on fallthrough.

16 files changed, 90 insertions, 172 deletions

diff --git a/dependencies.props b/dependencies.props
index e076c18a49..87f9d82bc2 100644
--- a/dependencies.props
+++ b/dependencies.props
@@ -15,7 +15,7 @@
   <!-- Full package version strings that are used in other parts of the build. -->
   <PropertyGroup>
     <CoreClrPackageVersion>1.1.0-beta-24431-01</CoreClrPackageVersion>
-    <XunitPackageVersion>2.1.0</XunitPackageVersion>
+    <XunitPackageVersion>2.2.0-beta2-build3300</XunitPackageVersion>
   </PropertyGroup>
 
   <!-- Package dependency verification/auto-upgrade configuration. -->
@@ -72,6 +72,7 @@
       <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" />
@@ -79,7 +80,7 @@
     <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.cli" />
     <XunitPerformanceDependency Include="Microsoft.DotNet.xunit.performance.runner.Windows" />
     <StaticDependency Include="@(XunitPerformanceDependency)">
-      <Version>1.0.0-alpha-build0035</Version>
+      <Version>1.0.0-alpha-build0040</Version>
     </StaticDependency>
 
     <StaticDependency Include="xunit.console.netcore">
diff --git a/tests/build.proj b/tests/build.proj
index 0dfd84d47b..63db903219 100644
--- a/tests/build.proj
+++ b/tests/build.proj
@@ -38,6 +38,7 @@
   <!-- Create a collection of all project.json files for dependency updates. -->
   <ItemGroup>
     <ProjectJsonFiles Include="$(SourceDir)**\project.json" />
+    <ProjectJsonFiles Include="$(ProjectDir)scripts\**\project.json" />
   </ItemGroup>
 
   <Target Name="UpdatePackageDependencyVersion">
diff --git a/tests/helix.targets b/tests/helix.targets
deleted file mode 100644
index 16acf01ca4..0000000000
--- a/tests/helix.targets
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <PropertyGroup>
-      <PackageTestRuntimeFolder>$(PackagesDir)test.Microsoft.NETCore.Runtime.CoreClr\1.1.1</PackageTestRuntimeFolder>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- TODO This should come from some package -->
-    <CoreRootFiles Include="$(CORE_ROOT)\crossgen.exe" /> 
-    <CoreRootFiles Include="$(CORE_ROOT)\ildasm.exe" /> 
-    <CoreRootFiles Include="$(CORE_ROOT)\ilasm.exe" /> 
-
-    <!-- TODO these files should get copied to core_root but does not as they are xunit files. Using temporary workaround for now -->
-    <CoreRootFiles Include="$(PackagesDir)Microsoft.DotNet.xunit.performance\1.0.0-alpha-build0035\lib\dotnet\xunit.performance.core.dll" />
-    <CoreRootFiles Include="$(PackagesDir)xunit.extensibility.core\2.1.0\lib\dotnet\xunit.core.dll" />
-  </ItemGroup>
-
-  <!-- replace *.lock.json to be that of actual tests than XunitWrapper -->
-  <Target Name="ReplaceProjectLockJson"
-          BeforeTargets="CopyTestToTestDirectory">
-    <PropertyGroup>
-      <ProjectLockJson></ProjectLockJson>
-      <TestRuntimeProjectLockJson></TestRuntimeProjectLockJson>
-    </PropertyGroup>
-    <ItemGroup>
-      <TestNugetProjectLockFile Include="$(SourceDir)$(Category)\**\project.lock.json"/>
-      <TestNugetProjectLockFile Include="$(TestRuntimeProjectLockJson)"/>
-    </ItemGroup>
-  </Target>
-
-  <Target Name="CopyProductInPackagesFolder"
-          BeforeTargets="CopyTestToTestDirectory">
-
-    <Copy
-      SourceFiles="@(CoreRootFiles)"
-      DestinationFolder="$(PackageTestRuntimeFolder)"
-      SkipUnchangedFiles="false"
-      OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
-      Retries="$(CopyRetryCount)"
-      RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
-      UseHardlinksIfPossible="$(CreateHardLinksForCopyFilesToOutputDirectoryIfPossible)">
-    </Copy>
- 
-  </Target>
-
-
-  <Target Name="AddFilesToAssemblyList" 
-          BeforeTargets="CreateAssemblyListTxt">
-
-    <ItemGroup>
-
-      <ToReplace Include="$(PackageTestRuntimeFolder)\*" />
-
-      <!-- In helix xunit tests are run using xunit.console.exe instead of msbuild xunitrunner.
-           This dependency should ideally be added in some project.json. But in the package the assemblies are present in tools folder.
-           Assemblies in tools folder are not resolved during restore. Therefore forcing addition direclty. -->
-      <XunitConsoleExe Include="$(PackagesDir)xunit.runner.console\**\xunit.console.exe" />
-      <XunitConsoleExe Include="$(PackagesDir)xunit.runner.console\**\xunit.runner.utility.desktop.dll" />
-
-      <ToRemove Include="@(_TestCopyLocalByFileNameWithoutDuplicates)" Condition="'%(_TestCopyLocalByFileNameWithoutDuplicates.Filename)' == 'xunit.performance.core'"/>
-      <ToRemove Include="@(_TestCopyLocalByFileNameWithoutDuplicates)" Condition="'%(_TestCopyLocalByFileNameWithoutDuplicates.Filename)' == 'xunit.core'"/>
-
-      <_TestCopyLocalByFileNameWithoutDuplicates Remove="@(ToRemove)" />
-
-      <_TestCopyLocalByFileNameWithoutDuplicates Include="@(ToReplace)">
-        <NugetPackageId>test.Microsoft.NETCore.Runtime.CoreClr</NugetPackageId>
-        <SourcePath>%(ToReplace.Identity)</SourcePath>
-      </_TestCopyLocalByFileNameWithoutDuplicates>
-
-      <_TestCopyLocalByFileNameWithoutDuplicates Include="@(XunitConsoleExe)">
-        <NugetPackageId>xunit.runner.console</NugetPackageId>
-        <SourcePath>%(XunitConsoleExe.Identity)</SourcePath>
-      </_TestCopyLocalByFileNameWithoutDuplicates>
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/tests/runtest.proj b/tests/runtest.proj
index c02b8c8f9f..e1c07e4101 100644
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -64,7 +64,6 @@ $(_XunitEpilog)
 
 ]]>
       </_XunitWrapperGen>
-      <XunitVersionCompiled>2.1.0</XunitVersionCompiled>
       <XunitWrapperGenCsProj>
         <![CDATA[
 <?xml version="1.0" encoding="utf-8"?>
@@ -120,7 +119,6 @@ $(_XunitEpilog)
     <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <Import Project="$(SourceDir)dir.targets" />
-  <Import Project="$(ProjectDir)helix.targets" />
   <PropertyGroup>
      <OutDir>$(XunitTestBinBase)\$(Category)\</OutDir>
   </PropertyGroup>
@@ -307,31 +305,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
   </Target>
 
   <Target Name="CreateAllWrappers" DependsOnTargets="GetListOfTestCmds;FindCmdDirectories">
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" />
-
-    <!--
-      Contents of a project.json that will be restored once with errors turned off. This works
-      around the package being incompatible with dotnet restore. Only the package contents are
-      required so the compatibility errors can be ignored.
-    -->
-    <PropertyGroup>
-      <XunitRunnerRestoreGenConfig>{ "dependencies": { "xunit.runner.msbuild": "$(XunitPackageVersion)" }, "frameworks": { "net45": {} } }</XunitRunnerRestoreGenConfig>
-      <XunitRunnerRestoreProjectDir>$(BaseOutputPath)\tempRestoreProject</XunitRunnerRestoreProjectDir>
-      <XunitRunnerRestoreProjectJsonPath>$(XunitRunnerRestoreProjectDir)\project.json</XunitRunnerRestoreProjectJsonPath>
-    </PropertyGroup>
-    
-    <MakeDir Directories="$(XunitRunnerRestoreProjectDir)" />
-    <WriteLinesToFile File="$(XunitRunnerRestoreProjectJsonPath)"
-                      Lines="$(XunitRunnerRestoreGenConfig)"
-                      Overwrite="true" />
-    
-    <Exec Command="$(DnuRestoreCommand) &quot;$(XunitRunnerRestoreProjectJsonPath)&quot;"
-          StandardOutputImportance="Low"
-          CustomErrorRegularExpression="^Unable to resolve .*"
-          IgnoreExitCode="true" 
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <MSBuild Projects="$(MSBuildProjectFile)" Targets="BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" />
+    <MSBuild Projects="$(MSBuildProjectFile)" Targets="CreateXunitWrapper;BuildXunitWrapper" Properties="_CMDDIR=%(TestDirectories.Identity)" />
   </Target>
 
   <Target Name="GetListOfTestCmds">
diff --git a/tests/scripts/project.json b/tests/scripts/project.json
index 8601127d71..a83f528032 100644
--- a/tests/scripts/project.json
+++ b/tests/scripts/project.json
@@ -1,15 +1,18 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance.run.core": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance":"1.0.0-alpha-build0035",
-    "xunit.console.netcore": "1.0.3-prerelease-00607-01",
-    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00629-04",
+    "Microsoft.DotNet.xunit.performance.run.core": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.analysis.cli": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.runner.cli": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+    "xunit.console.netcore": "1.0.2-prerelease-00101",
+    "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00629-04"
   },
   "frameworks": {
-    "netstandard1.3":{
-    "imports":["dnxcore50", "portable-net45+win8"]
-     }
+    "netstandard1.3": {
+      "imports": [
+        "dnxcore50",
+        "portable-net45+win8"
+      ]
+    }
   }
-}
\ No newline at end of file
+}
diff --git a/tests/scripts/run-xunit-perf.cmd b/tests/scripts/run-xunit-perf.cmd
index cece893cab..605b43f2d6 100644
--- a/tests/scripts/run-xunit-perf.cmd
+++ b/tests/scripts/run-xunit-perf.cmd
@@ -28,8 +28,8 @@ pushd sandbox
 @rem stage stuff we need
 
 @rem xunit and perf
-xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.runner.Windows\1.0.0-alpha-build0035\tools\* . > %RUNLOG%
-xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.analysis\1.0.0-alpha-build0035\tools\* . > %RUNLOG%
+xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.runner.Windows\1.0.0-alpha-build0040\tools\* . > %RUNLOG%
+xcopy /sy %CORECLR_REPO%\packages\Microsoft.DotNet.xunit.performance.analysis\1.0.0-alpha-build0040\tools\* . > %RUNLOG%
 xcopy /sy %CORECLR_REPO%\packages\xunit.console.netcore\1.0.2-prerelease-00101\runtimes\any\native\* . > %RUNLOG%
 xcopy /sy %CORECLR_REPO%\bin\tests\Windows_NT.x64.Release\Tests\Core_Root\* . > %RUNLOG%
 
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index b504cf88f1..7aa96c54a4 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -1,12 +1,12 @@
 {
   "dependencies": {
-    "xunit": "2.1.0",
+    "xunit": "2.2.0-beta2-build3300",
     "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0",
+    "xunit.runner.utility": "2.2.0-beta2-build3300",
     "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
     "Microsoft.Win32.Primitives": "4.3.0-beta-24431-01",
     "Newtonsoft.Json": "7.0.1",
     "Microsoft.NETCore.Platforms": "4.3.0-beta-24431-01",
diff --git a/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj b/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
index cc8261f26e..d013349cc9 100644
--- a/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
+++ b/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj
@@ -35,11 +35,12 @@
     <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.39.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
+    <Reference Include="Microsoft.Diagnostics.Tracing.TraceEvent, Version=1.0.41.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.FileSystem, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>packages\System.IO.FileSystem.4.0.0\lib\net46\System.IO.FileSystem.dll</HintPath>
@@ -56,27 +57,27 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.abstractions.dll</HintPath>
+      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.abstractions.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
+    <Reference Include="xunit.core, Version=2.2.0.3300, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>packages\xunit.extensibility.core.2.2.0-beta2-build3300\lib\netstandard1.0\xunit.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.execution.desktop, Version=2.2.0.3300, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
+      <HintPath>packages\xunit.extensibility.execution.2.2.0-beta2-build3300\lib\net45\xunit.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.performance.core, Version=1.0.0.30, Culture=neutral, PublicKeyToken=67066efe964d3b03, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.performance.core.dll</HintPath>
+    <Reference Include="xunit.performance.core, Version=1.0.0.40, Culture=neutral, PublicKeyToken=67066efe964d3b03, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.performance.core.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.performance.execution.desktop, Version=1.0.0.30, Culture=neutral, PublicKeyToken=67066efe964d3b03, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0030\lib\net46\xunit.performance.execution.desktop.dll</HintPath>
+    <Reference Include="xunit.performance.execution.desktop, Version=1.0.0.40, Culture=neutral, PublicKeyToken=67066efe964d3b03, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0040\lib\net46\xunit.performance.execution.desktop.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="xunit.performance.metrics, Version=1.0.0.30, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.performance.metrics.dll</HintPath>
+    <Reference Include="xunit.performance.metrics, Version=1.0.0.40, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.performance.metrics.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -102,12 +103,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
+  <Import Project="packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets" Condition="Exists('packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
+    <Error Condition="!Exists('packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\build\Microsoft.Diagnostics.Tracing.TraceEvent.targets'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/tests/src/GC/Performance/Framework/packages.config b/tests/src/GC/Performance/Framework/packages.config
index 16572761b4..c43e175825 100644
--- a/tests/src/GC/Performance/Framework/packages.config
+++ b/tests/src/GC/Performance/Framework/packages.config
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.39" targetFramework="net461" />
-  <package id="Microsoft.DotNet.xunit.performance" version="1.0.0-alpha-build0030" targetFramework="net461" />
-  <package id="Microsoft.DotNet.xunit.performance.metrics" version="1.0.0-alpha-build0030" targetFramework="net461" />
+  <package id="Microsoft.Diagnostics.Tracing.TraceEvent" version="1.0.41" targetFramework="net461" />
+  <package id="Microsoft.DotNet.xunit.performance" version="1.0.0-alpha-build0040" targetFramework="net461" />
+  <package id="Microsoft.DotNet.xunit.performance.metrics" version="1.0.0-alpha-build0040" targetFramework="net461" />
   <package id="System.Collections" version="4.0.10" targetFramework="net461" />
   <package id="System.Diagnostics.Debug" version="4.0.10" targetFramework="net461" />
-  <package id="System.Diagnostics.Tracing" version="4.0.20" targetFramework="net461" />
+  <package id="System.Diagnostics.Tracing" version="4.1.0" targetFramework="net461" />
   <package id="System.Globalization" version="4.0.10" targetFramework="net461" />
-  <package id="System.IO" version="4.0.10" targetFramework="net461" />
+  <package id="System.IO" version="4.1.0" targetFramework="net461" />
   <package id="System.IO.FileSystem" version="4.0.0" targetFramework="net461" />
   <package id="System.IO.FileSystem.Primitives" version="4.0.0" targetFramework="net461" />
-  <package id="System.Linq" version="4.0.0" targetFramework="net461" />
-  <package id="System.Reflection" version="4.0.10" targetFramework="net461" />
-  <package id="System.Runtime" version="4.0.20" targetFramework="net461" />
-  <package id="System.Runtime.Extensions" version="4.0.10" targetFramework="net461" />
+  <package id="System.Linq" version="4.1.0" targetFramework="net461" />
+  <package id="System.Reflection" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime" version="4.1.0" targetFramework="net461" />
+  <package id="System.Runtime.Extensions" version="4.1.0" targetFramework="net461" />
   <package id="System.Runtime.Handles" version="4.0.0" targetFramework="net461" />
   <package id="System.Text.Encoding" version="4.0.10" targetFramework="net461" />
   <package id="System.Threading" version="4.0.10" targetFramework="net461" />
   <package id="System.Threading.Tasks" version="4.0.10" targetFramework="net461" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net461" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net461" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net461" />
+  <package id="xunit.abstractions" version="2.0.1-rc2" targetFramework="net461" />
+  <package id="xunit.extensibility.core" version="2.2.0-beta2-build3300" targetFramework="net461" />
+  <package id="xunit.extensibility.execution" version="2.2.0-beta2-build3300" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json
index 922737f3fd..e35433c484 100644
--- a/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -1,9 +1,9 @@
 {
   "dependencies": {
     "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
     "Microsoft.NETCore.Platforms": "4.3.0-beta-24431-01",
     "System.Console": "4.3.0-beta-24431-01",
     "System.Dynamic.Runtime": "4.3.0-beta-24431-01",
@@ -21,9 +21,9 @@
     "System.Threading.Tasks": "4.3.0-beta-24431-01",
     "System.Threading.Tasks.Parallel": "4.3.0-beta-24431-01",
     "System.Security.Cryptography.Algorithms": "4.3.0-beta-24431-01",
-    "xunit": "2.1.0",
+    "xunit": "2.2.0-beta2-build3300",
     "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0"
+    "xunit.runner.utility": "2.2.0-beta2-build3300"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json
index 193170ddae..8a2935b37f 100644
--- a/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/tests/src/JIT/config/benchmark+serialize/project.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
     "Microsoft.NETCore.Platforms": "4.3.0-beta-24431-01",
     "Newtonsoft.Json": "7.0.1",
     "System.Console": "4.3.0-beta-24431-01",
@@ -18,9 +18,9 @@
     "System.Text.RegularExpressions": "4.3.0-beta-24431-01",
     "System.Xml.XmlDocument": "4.3.0-beta-24431-01",
     "System.Xml.XmlSerializer": "4.3.0-beta-24431-01",
-    "xunit": "2.1.0",
+    "xunit": "2.2.0-beta2-build3300",
     "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0"
+    "xunit.runner.utility": "2.2.0-beta2-build3300"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/tests/src/JIT/config/benchmark/project.json b/tests/src/JIT/config/benchmark/project.json
index f8b6e1caaa..93861077fd 100644
--- a/tests/src/JIT/config/benchmark/project.json
+++ b/tests/src/JIT/config/benchmark/project.json
@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
+    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
     "Microsoft.NETCore.Platforms": "4.3.0-beta-24431-01",
     "System.Collections.NonGeneric": "4.3.0-beta-24431-01",
     "System.Console": "4.3.0-beta-24431-01",
@@ -21,9 +21,9 @@
     "System.Xml.XmlDocument": "4.3.0-beta-24431-01",
     "System.Xml.XPath": "4.3.0-beta-24431-01",
     "System.Xml.XPath.XmlDocument": "4.3.0-beta-24431-01",
-    "xunit": "2.1.0",
+    "xunit": "2.2.0-beta2-build3300",
     "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0"
+    "xunit.runner.utility": "2.2.0-beta2-build3300"
   },
   "frameworks": {
     "netcoreapp1.0": {
diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json
index 07ede5fca1..b9534119a9 100644
--- a/tests/src/TestWrappersConfig/project.json
+++ b/tests/src/TestWrappersConfig/project.json
@@ -1,10 +1,17 @@
 {
   "dependencies": {
-    "xunit": "2.1.0",
-    "xunit.assert": "2.1.0",
-    "xunit.core": "2.1.0"
+    "xunit": "2.2.0-beta2-build3300",
+    "xunit.assert": "2.2.0-beta2-build3300",
+    "xunit.core": "2.2.0-beta2-build3300",
+    "xunit.runner.msbuild": "2.2.0-beta2-build3300"
   },
   "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",  
+        "portable-net45+win8"
+      ]
+    },
     "net45": {
       "imports": "portable-net45+win8"
     }
diff --git a/tests/src/dir.props b/tests/src/dir.props
index 3b2754c221..262feeaaaf 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -35,6 +35,7 @@
       <PropertyGroup>
         <TargetsWindows>true</TargetsWindows>
         <TestNugetRuntimeId>win7-x64</TestNugetRuntimeId>
+        <DefaultTestTFM>net45</DefaultTestTFM>
       </PropertyGroup>
     </When>
     <When Condition="'$(OSGroup)'=='Linux'">
@@ -69,6 +70,14 @@
     <TargetsUnknownUnix Condition="'$(TargetsUnix)' == 'true' AND '$(OSGroup)' != 'FreeBSD' AND '$(OSGroup)' != 'Linux' AND '$(OSGroup)' != 'OSX'">true</TargetsUnknownUnix>
   </PropertyGroup>
 
+  <!-- Default Test platform to deploy the netstandard compiled tests to -->
+  <PropertyGroup>
+    <!-- we default TestTFM and FilterToTestTFM to netcoreapp1.0 if they are not explicity defined -->
+    <DefaultTestTFM Condition="'$(DefaultTestTFM)'==''">netcoreapp1.0</DefaultTestTFM>
+    <TestTFM Condition="'$(TestTFM)'==''">$(DefaultTestTFM)</TestTFM>
+    <FilterToTestTFM Condition="'$(FilterToTestTFM)'==''">$(DefaultTestTFM)</FilterToTestTFM>
+  </PropertyGroup>
+
   <!-- Set default ZapRequire level (used only when CrossGen is enabled) -->
   <PropertyGroup>
     <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
diff --git a/tests/tests.targets b/tests/tests.targets
index 56c6c5d711..78028cda27 100644
--- a/tests/tests.targets
+++ b/tests/tests.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask AssemblyFile="$(PackagesDir)xunit.runner.msbuild\2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
+  <UsingTask AssemblyFile="$(PackagesDir)xunit.runner.msbuild\$(XunitPackageVersion)\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
   
   <ItemGroup>
     <_SkipTestAssemblies Include="$(SkipTestAssemblies)" />
@@ -27,7 +27,7 @@
   </Target>
 
   <UsingTask
-    AssemblyFile="$(SourceDir)\packages\xunit.runner.msbuild\2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll"
+    AssemblyFile="$(SourceDir)\packages\xunit.runner.msbuild\$(XunitPackageVersion)\build\portable-net45+win8+wp8+wpa81\xunit.runner.msbuild.dll"
     TaskName="Xunit.Runner.MSBuild.xunit" />
 
    <Target Name="RunTests"
diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets
index 6d5c5e2664..3b343bd891 100644
--- a/tests/xunitwrapper.targets
+++ b/tests/xunitwrapper.targets
@@ -10,7 +10,7 @@
                                          AllowFallbackOnTargetSelection="true"
                                          IncludeFrameworkReferences="false"
                                          NuGetPackagesDirectory="$(PackagesDir)"
-                                         RuntimeIdentifier="dotnet"
+                                         RuntimeIdentifier="$(TestNugetRuntimeId)"
                                          ProjectLanguage="$(Language)"
                                          ProjectLockFile="$(ProjectLockJson)"
                                          TargetMonikers="$(TargetFrameworkMoniker)">