diff options
| author | Davis Goodin <dagood@microsoft.com> | 2016-08-18 10:31:02 -0500 |
|---|---|---|
| committer | Davis Goodin <dagood@microsoft.com> | 2016-09-01 15:53:10 -0500 |
| commit | 2493a6ef84cdafde9c7e5730f5a20183aa267035 (patch) | |
| tree | b511035d810b8f015da2966f08390f3658924949 /tests/tests.targets | |
| parent | bcd4c0c7ff141f854c1c3727f9a5cf45ea3efd43 (diff) | |
| download | coreclr-2493a6ef84cdafde9c7e5730f5a20183aa267035.tar.gz coreclr-2493a6ef84cdafde9c7e5730f5a20183aa267035.tar.bz2 coreclr-2493a6ef84cdafde9c7e5730f5a20183aa267035.zip | |
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.
Diffstat (limited to 'tests/tests.targets')
| -rw-r--r-- | tests/tests.targets | 4 |
1 files changed, 2 insertions, 2 deletions
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" |