From 85b1ac37bfd60da4cdbe3234a5373565e895cedd Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 9 Feb 2016 21:40:22 -0800 Subject: [PATCH] Enable tests to run using donet xunit test runner --- .../project.json | 15 +++++------- .../project.json | 15 +++++------- .../project.json | 23 ++++++++----------- .../project.json | 21 ++++++++--------- .../project.json | 13 +++++++---- .../project.json | 21 ++++++++--------- 6 files changed, 48 insertions(+), 60 deletions(-) diff --git a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json index a3c93adde2..b4661a5537 100644 --- a/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json +++ b/test/Microsoft.AspNetCore.Cryptography.Internal.Test/project.json @@ -10,23 +10,20 @@ "xunit": "2.1.0" }, "frameworks": { - "dnx451": { - "dependencies": { - "xunit.runner.console": "2.1.0" - } - }, "dnxcore50": { "dependencies": { - "xunit.runner.aspnet": "2.0.0-aspnet-*", + "dotnet-test-xunit": "1.0.0-dev-*", "System.Runtime": "4.0.21-*" }, "imports": "portable-net451+win8" + }, + "dnx451": { + "dependencies": { + "xunit.runner.console": "2.1.0" + } } }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compilationOptions": { "allowUnsafe": true, "keyFile": "../../tools/Key.snk", diff --git a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json index 5dd067a099..7133275a83 100644 --- a/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json +++ b/test/Microsoft.AspNetCore.Cryptography.KeyDerivation.Test/project.json @@ -8,23 +8,20 @@ "xunit": "2.1.0" }, "frameworks": { - "dnx451": { - "dependencies": { - "xunit.runner.console": "2.1.0" - } - }, "dnxcore50": { "dependencies": { - "xunit.runner.aspnet": "2.0.0-aspnet-*", + "dotnet-test-xunit": "1.0.0-dev-*", "System.Runtime": "4.0.21-*" }, "imports": "portable-net451+win8" + }, + "dnx451": { + "dependencies": { + "xunit.runner.console": "2.1.0" + } } }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compilationOptions": { "allowUnsafe": true, "warningsAsErrors": true, diff --git a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json index 2aba8ab2df..96406b831d 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Abstractions.Test/project.json @@ -7,28 +7,25 @@ "xunit": "2.1.0" }, "frameworks": { + "dnxcore50": { + "dependencies": { + "moq.netcore": "4.4.0-beta8", + "dotnet-test-xunit": "1.0.0-dev-*", + "System.Runtime": "4.0.21-*" + }, + "imports": "portable-net451+win8" + }, "dnx451": { "dependencies": { "Moq": "4.2.1312.1622", "xunit.runner.console": "2.1.0" - } - }, - "dnxcore50": { - "dependencies": { - "moq.netcore": "4.4.0-beta8", - "xunit.runner.aspnet": "2.0.0-aspnet-*", - "System.Runtime": "4.0.21-*" - }, - "imports": "portable-net451+win8" + } } }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compile": "../common/**/*.cs", "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk" } -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json index 33d9c7c915..d663d03bc3 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Extensions.Test/project.json @@ -11,25 +11,22 @@ "xunit": "2.1.0" }, "frameworks": { + "dnxcore50": { + "dependencies": { + "moq.netcore": "4.4.0-beta8", + "dotnet-test-xunit": "1.0.0-dev-*", + "System.Runtime": "4.0.21-*" + }, + "imports": "portable-net451+win8" + }, "dnx451": { "dependencies": { "Moq": "4.2.1312.1622", "xunit.runner.console": "2.1.0" - } - }, - "dnxcore50": { - "dependencies": { - "moq.netcore": "4.4.0-beta8", - "xunit.runner.aspnet": "2.0.0-aspnet-*", - "System.Runtime": "4.0.21-*" - }, - "imports": "portable-net451+win8" + } } }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compilationOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk" diff --git a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json b/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json index 33e2b1875f..79dc1c3472 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Test.Shared/project.json @@ -1,11 +1,14 @@ { "frameworks": { - "dnx451": { }, "dnxcore50": { "dependencies": { - "System.Runtime": "4.0.21-*" - } - } + "System.Runtime": "4.0.21-*", + "dotnet-test-xunit": "1.0.0-dev-*", + "Microsoft.NETCore.Platforms": "1.0.1-*" + }, + "imports": "portable-net451+win8" + }, + "dnx451": {} }, "shared": "**/*.cs" -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.DataProtection.Test/project.json b/test/Microsoft.AspNetCore.DataProtection.Test/project.json index 49af17ddfe..5b000e9138 100644 --- a/test/Microsoft.AspNetCore.DataProtection.Test/project.json +++ b/test/Microsoft.AspNetCore.DataProtection.Test/project.json @@ -11,25 +11,22 @@ "xunit": "2.1.0" }, "frameworks": { + "dnxcore50": { + "dependencies": { + "moq.netcore": "4.4.0-beta8", + "dotnet-test-xunit": "1.0.0-dev-*", + "System.Runtime": "4.0.21-*" + }, + "imports": "portable-net451+win8" + }, "dnx451": { "dependencies": { "Moq": "4.2.1312.1622", "xunit.runner.console": "2.1.0" - } - }, - "dnxcore50": { - "dependencies": { - "moq.netcore": "4.4.0-beta8", - "xunit.runner.aspnet": "2.0.0-aspnet-*", - "System.Runtime": "4.0.21-*" - }, - "imports": "portable-net451+win8" + } } }, "testRunner": "xunit", - "commands": { - "test": "xunit.runner.aspnet" - }, "compilationOptions": { "allowUnsafe": true, "warningsAsErrors": true,