From 7ba4d296e3e0a2445ffa708c1e918d90d2bac69c Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Tue, 24 May 2016 15:41:40 -0700 Subject: Update tests to use NETCoreApp1.0 moniker Requires https://github.com/dotnet/buildtools/pull/751 This makes all the tests resolve using NETCoreApp1.0 instead of DNXCore50. I've removed the netstandard1.6 import since that is no longer needed. I've also removed the workarounds from tests that were targeting netcoreapp1.0 on their own. For restore compat I've added an DNXCore50 import to every test project. These can be removed once test-runtime packages are updated to target NETCoreApp1.0. I've updated all the test scripts which were assuming DNXCore50 as well as docs which referred to this path. --- Documentation/debugging/windows-instructions.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Documentation/debugging') diff --git a/Documentation/debugging/windows-instructions.md b/Documentation/debugging/windows-instructions.md index 20b17438b3..7e276d9796 100644 --- a/Documentation/debugging/windows-instructions.md +++ b/Documentation/debugging/windows-instructions.md @@ -41,15 +41,15 @@ To run a single test from command line: * Locate the test binary folder based on the CSPROJ name. -For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50`. +For example: `src\System.Net.Sockets\tests\Functional\System.Net.Sockets.Tests.csproj` will build and output binaries at `bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0`. * Execute the test Assuming that your repo is at `C:\corefx`: ``` -cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50 -C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\dnxcore50\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing +cd C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0 +C:\corefx\bin\tests\Windows_NT.AnyCPU.Debug\System.Net.Sockets.Tests\netcoreapp1.0\CoreRun.exe xunit.console.netcore.exe System.Net.Sockets.Tests.dll -xml testResults.xml -notrait category=nonwindowstests -notrait category=OuterLoop -notrait category=failing ``` * If the test crashes or encounteres a `Debugger.Launch()` method call, WinDBG will automatically start and attach to the `CoreRun.exe` process -- cgit v1.2.3