From 2493a6ef84cdafde9c7e5730f5a20183aa267035 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Thu, 18 Aug 2016 10:31:02 -0500 Subject: [PATCH] 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. --- dependencies.props | 5 +- tests/build.proj | 1 + tests/helix.targets | 78 ---------------------- tests/runtest.proj | 28 +------- tests/scripts/project.json | 23 ++++--- tests/scripts/run-xunit-perf.cmd | 4 +- tests/src/Common/test_dependencies/project.json | 10 +-- .../Framework/GCPerfTestFramework.csproj | 31 ++++----- tests/src/GC/Performance/Framework/packages.config | 24 +++---- tests/src/JIT/config/benchmark+roslyn/project.json | 10 +-- .../JIT/config/benchmark+serialize/project.json | 10 +-- tests/src/JIT/config/benchmark/project.json | 10 +-- tests/src/TestWrappersConfig/project.json | 13 +++- tests/src/dir.props | 9 +++ tests/tests.targets | 4 +- tests/xunitwrapper.targets | 2 +- 16 files changed, 90 insertions(+), 172 deletions(-) delete mode 100644 tests/helix.targets diff --git a/dependencies.props b/dependencies.props index e076c18..87f9d82 100644 --- a/dependencies.props +++ b/dependencies.props @@ -15,7 +15,7 @@ 1.1.0-beta-24431-01 - 2.1.0 + 2.2.0-beta2-build3300 @@ -72,6 +72,7 @@ $(XunitPackageVersion) + @@ -79,7 +80,7 @@ - 1.0.0-alpha-build0035 + 1.0.0-alpha-build0040 diff --git a/tests/build.proj b/tests/build.proj index 0dfd84d..63db903 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -38,6 +38,7 @@ + diff --git a/tests/helix.targets b/tests/helix.targets deleted file mode 100644 index 16acf01..0000000 --- a/tests/helix.targets +++ /dev/null @@ -1,78 +0,0 @@ - - - - - $(PackagesDir)test.Microsoft.NETCore.Runtime.CoreClr\1.1.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <_TestCopyLocalByFileNameWithoutDuplicates Remove="@(ToRemove)" /> - - <_TestCopyLocalByFileNameWithoutDuplicates Include="@(ToReplace)"> - test.Microsoft.NETCore.Runtime.CoreClr - %(ToReplace.Identity) - - - <_TestCopyLocalByFileNameWithoutDuplicates Include="@(XunitConsoleExe)"> - xunit.runner.console - %(XunitConsoleExe.Identity) - - - - - diff --git a/tests/runtest.proj b/tests/runtest.proj index c02b8c8..e1c07e4 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -64,7 +64,6 @@ $(_XunitEpilog) ]]> - 2.1.0 @@ -120,7 +119,6 @@ $(_XunitEpilog) %24(TestWrappersPackagesConfigFileDirectory)project.lock.json - $(XunitTestBinBase)\$(Category)\ @@ -307,31 +305,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). - - - - - { "dependencies": { "xunit.runner.msbuild": "$(XunitPackageVersion)" }, "frameworks": { "net45": {} } } - $(BaseOutputPath)\tempRestoreProject - $(XunitRunnerRestoreProjectDir)\project.json - - - - - - - - + diff --git a/tests/scripts/project.json b/tests/scripts/project.json index 8601127..a83f528 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 cece893..605b43f 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 b504cf8..7aa96c5 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 cc8261f..d013349 100644 --- a/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj +++ b/tests/src/GC/Performance/Framework/GCPerfTestFramework.csproj @@ -35,11 +35,12 @@ x64 - - packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.39\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll + + packages\Microsoft.Diagnostics.Tracing.TraceEvent.1.0.41\lib\net40\Microsoft.Diagnostics.Tracing.TraceEvent.dll True + packages\System.IO.FileSystem.4.0.0\lib\net46\System.IO.FileSystem.dll @@ -56,27 +57,27 @@ - packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.abstractions.dll + packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.abstractions.dll True - - packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll + + packages\xunit.extensibility.core.2.2.0-beta2-build3300\lib\netstandard1.0\xunit.core.dll True - - packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll + + packages\xunit.extensibility.execution.2.2.0-beta2-build3300\lib\net45\xunit.execution.desktop.dll True - - packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.performance.core.dll + + packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.performance.core.dll True - - packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0030\lib\net46\xunit.performance.execution.desktop.dll + + packages\Microsoft.DotNet.xunit.performance.1.0.0-alpha-build0040\lib\net46\xunit.performance.execution.desktop.dll True - - packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0030\lib\net46\xunit.performance.metrics.dll + + packages\Microsoft.DotNet.xunit.performance.metrics.1.0.0-alpha-build0040\lib\net46\xunit.performance.metrics.dll True @@ -102,12 +103,12 @@ - + 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}. - + + + + netcoreapp1.0 + $(DefaultTestTFM) + $(DefaultTestTFM) + + 2 diff --git a/tests/tests.targets b/tests/tests.targets index 56c6c5d..78028cd 100644 --- a/tests/tests.targets +++ b/tests/tests.targets @@ -1,7 +1,7 @@ - + <_SkipTestAssemblies Include="$(SkipTestAssemblies)" /> @@ -27,7 +27,7 @@ -- 2.7.4