From c00a2de2c7df8185418cafff457c6ed3c7c6d91e Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Fri, 5 Feb 2016 16:13:30 -0800 Subject: [PATCH] Enabled tests to run in dotnet xunit runner --- build.cmd | 9 ++++----- .../project.json | 20 +++++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/build.cmd b/build.cmd index ebb619e737..fa5e51f81e 100644 --- a/build.cmd +++ b/build.cmd @@ -28,12 +28,11 @@ IF NOT EXIST %NUGET_PATH% ( copy %CACHED_NUGET% %NUGET_PATH% > nul ) +SET KOREBUILD_DOWNLOAD_ARGS= +IF NOT "%KOREBUILD_VERSION%"=="" ( + SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION% +) IF NOT EXIST %KOREBUILD_FOLDER% ( - SET KOREBUILD_DOWNLOAD_ARGS= - IF NOT "%KOREBUILD_VERSION%"=="" ( - SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION% - ) - %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS% ) diff --git a/test/Microsoft.AspNetCore.Session.Tests/project.json b/test/Microsoft.AspNetCore.Session.Tests/project.json index dc30f9faac..e158ff0d08 100644 --- a/test/Microsoft.AspNetCore.Session.Tests/project.json +++ b/test/Microsoft.AspNetCore.Session.Tests/project.json @@ -8,23 +8,21 @@ "xunit": "2.1.0" }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "frameworks": { + "dnxcore50": { + "dependencies": { + "dotnet-test-xunit": "1.0.0-dev-*", + "Microsoft.NETCore.Platforms": "1.0.1-*" + }, + "imports": "portable-net451+win8" + }, "dnx451": { "frameworkAssemblies": { - "System.Threading.Tasks": "" + "System.Threading.Tasks": "" }, "dependencies": { "xunit.runner.console": "2.1.0" } - }, - "dnxcore50": { - "dependencies": { - "xunit.runner.aspnet": "2.0.0-aspnet-*" - }, - "imports": "portable-net451+win8" } } -} +} \ No newline at end of file