From 2493a6ef84cdafde9c7e5730f5a20183aa267035 Mon Sep 17 00:00:00 2001
From: Davis Goodin <dagood@microsoft.com>
Date: Thu, 18 Aug 2016 10:31:02 -0500
Subject: 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.
---
 tests/src/dir.props | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'tests/src/dir.props')

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>
-- 
cgit v1.2.3