From 440b8bc0bae7c8447b0267399343c1427eb8467c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 14 Apr 2016 14:34:51 -0700 Subject: [PATCH] Migrate tests, tools and samples to portable --- .../project.json | 7 +++++-- .../project.json | 7 +++++-- test/Microsoft.AspNetCore.Http.Features.Tests/project.json | 7 +++++-- test/Microsoft.AspNetCore.Http.Tests/project.json | 7 +++++-- test/Microsoft.AspNetCore.Owin.Tests/project.json | 7 +++++-- .../HttpResponseStreamWriterTest.cs | 4 ++-- test/Microsoft.AspNetCore.WebUtilities.Tests/project.json | 7 +++++-- test/Microsoft.Net.Http.Headers.Tests/project.json | 7 +++++-- 8 files changed, 37 insertions(+), 16 deletions(-) diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json index 53d46c1296..89f0b35888 100644 --- a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json @@ -9,10 +9,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json index 6be3f37115..231a6b5335 100644 --- a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json @@ -6,10 +6,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json index 6eecb1fcd2..df5ad046eb 100644 --- a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json @@ -4,10 +4,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Http.Tests/project.json b/test/Microsoft.AspNetCore.Http.Tests/project.json index f1039dabcd..9e1e7cc91e 100644 --- a/test/Microsoft.AspNetCore.Http.Tests/project.json +++ b/test/Microsoft.AspNetCore.Http.Tests/project.json @@ -4,10 +4,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Owin.Tests/project.json b/test/Microsoft.AspNetCore.Owin.Tests/project.json index 86313d922a..14b0a2149a 100644 --- a/test/Microsoft.AspNetCore.Owin.Tests/project.json +++ b/test/Microsoft.AspNetCore.Owin.Tests/project.json @@ -6,10 +6,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs index 372525731d..1fe8ed17bd 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs @@ -312,7 +312,7 @@ namespace Microsoft.AspNetCore.WebUtilities.Test [Theory] [InlineData("你好世界", "utf-16")] -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 // CoreCLR does not like shift_jis as an encoding. [InlineData("こんにちは世界", "shift_jis")] #endif @@ -343,7 +343,7 @@ namespace Microsoft.AspNetCore.WebUtilities.Test [InlineData('你', 1023, "utf-16")] [InlineData('你', 1024, "utf-16")] [InlineData('你', 1050, "utf-16")] -#if !NETSTANDARDAPP1_5 +#if !NETCOREAPP1_0 // CoreCLR does not like shift_jis as an encoding. [InlineData('こ', 1023, "shift_jis")] [InlineData('こ', 1024, "shift_jis")] diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json index 9fc1fb6945..22d1b91b1f 100644 --- a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json +++ b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json @@ -8,11 +8,14 @@ }, "testRunner": "xunit", "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "System.Text.Encoding.Extensions": "4.0.11-*", "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [ diff --git a/test/Microsoft.Net.Http.Headers.Tests/project.json b/test/Microsoft.Net.Http.Headers.Tests/project.json index 164e49f735..37b79db045 100644 --- a/test/Microsoft.Net.Http.Headers.Tests/project.json +++ b/test/Microsoft.Net.Http.Headers.Tests/project.json @@ -5,10 +5,13 @@ "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*", - "NETStandard.Library": "1.5.0-*", "System.Diagnostics.Process": "4.1.0-*" }, "imports": [