From 4432018ebe6700521b40f56fd555b0e360941302 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Fri, 15 Apr 2016 09:34:48 -0700 Subject: [PATCH] Migrate tests, tools and samples to portable --- samples/DatabaseErrorPageSample/project.json | 10 ++++++---- samples/DeveloperExceptionPageSample/project.json | 10 ++++++---- samples/ElmPageSample/project.json | 10 ++++++---- samples/ExceptionHandlerSample/project.json | 10 ++++++---- samples/MiddlewareAnalysisSample/project.json | 10 ++++++---- samples/RuntimeInfoPageSample/project.json | 10 ++++++---- samples/StatusCodePagesSample/project.json | 10 ++++++---- samples/WelcomePageSample/project.json | 10 ++++++---- src/PageGenerator/project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 10 +++++++--- .../project.json | 7 +++++-- .../project.json | 10 +++++++--- .../project.json | 7 +++++-- 14 files changed, 82 insertions(+), 46 deletions(-) diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json index 9f72cc8054..eed28de915 100644 --- a/samples/DatabaseErrorPageSample/project.json +++ b/samples/DatabaseErrorPageSample/project.json @@ -5,21 +5,23 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*", - "Microsoft.EntityFrameworkCore.Commands": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.EntityFrameworkCore.Commands": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net451+win8" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json index 1b413fa3c3..5416c97426 100644 --- a/samples/DeveloperExceptionPageSample/project.json +++ b/samples/DeveloperExceptionPageSample/project.json @@ -2,20 +2,22 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json index 8c5920fd41..643725ad72 100644 --- a/samples/ElmPageSample/project.json +++ b/samples/ElmPageSample/project.json @@ -2,20 +2,22 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics.Elm": "0.1.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json index 27cec96aad..b54489c9ae 100644 --- a/samples/ExceptionHandlerSample/project.json +++ b/samples/ExceptionHandlerSample/project.json @@ -3,20 +3,22 @@ "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.StaticFiles": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json index 5c1dd72566..75f5e53444 100644 --- a/samples/MiddlewareAnalysisSample/project.json +++ b/samples/MiddlewareAnalysisSample/project.json @@ -5,20 +5,22 @@ "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json index 1b413fa3c3..5416c97426 100644 --- a/samples/RuntimeInfoPageSample/project.json +++ b/samples/RuntimeInfoPageSample/project.json @@ -2,20 +2,22 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json index 5a867e2ab8..a439749df9 100644 --- a/samples/StatusCodePagesSample/project.json +++ b/samples/StatusCodePagesSample/project.json @@ -5,17 +5,19 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json index 1b413fa3c3..5416c97426 100644 --- a/samples/WelcomePageSample/project.json +++ b/samples/WelcomePageSample/project.json @@ -2,20 +2,22 @@ "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*" + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, "compilationOptions": { "emitEntryPoint": true }, "frameworks": { "net451": {}, - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50" ], "dependencies": { - "NETStandard.Library": "1.5.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json index 789d207720..1a850d976d 100644 --- a/src/PageGenerator/project.json +++ b/src/PageGenerator/project.json @@ -14,9 +14,12 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { - "System.Console": "4.0.0-*" + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + } } } }, diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json index 9faca98c01..bb2cac57ba 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json @@ -5,13 +5,16 @@ "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests": "1.0.0", "Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", "xunit": "2.1.0" }, "testRunner": "xunit", "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json index b08df0b97a..95d63dd94d 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json @@ -6,7 +6,6 @@ "Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", "xunit": "2.1.0" }, "compile": [ @@ -15,10 +14,15 @@ ], "testRunner": "xunit", "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "moq.netcore": "4.4.0-beta8", - "dotnet-test-xunit": "1.0.0-dev-*" + "dotnet-test-xunit": "1.0.0-dev-*", + "System.Diagnostics.TraceSource": "4.0.0-*" }, "imports": [ "dnxcore50", diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json index de31efbd3c..b343b3b753 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json @@ -7,7 +7,6 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.TestHost": "1.0.0-*", "Microsoft.AspNetCore.Testing": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", "MiddlewareAnalysisSample": "1.0.0", "RuntimeInfoPageSample": "1.0.0", "StatusCodePagesSample": "1.0.0", @@ -20,12 +19,16 @@ "bower_components" ], "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "imports": [ "dnxcore50", "portable-net451+win8" ], "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "dotnet-test-xunit": "1.0.0-dev-*" } }, diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json index d657e03e88..70a74971fc 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json @@ -11,14 +11,18 @@ "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", "xunit": "2.1.0" }, "frameworks": { - "netstandardapp1.5": { + "netcoreapp1.0": { "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0-*", + "type": "platform" + }, "moq.netcore": "4.4.0-beta8", - "dotnet-test-xunit": "1.0.0-dev-*" + "dotnet-test-xunit": "1.0.0-dev-*", + "System.Diagnostics.TraceSource": "4.0.0-*" }, "imports": [ "dnxcore50", diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json index 12b06c3b58..518bea8f1d 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json @@ -9,12 +9,15 @@ "Microsoft.AspNetCore.Testing": "1.0.0-*", "Microsoft.Extensions.DependencyInjection": "1.0.0-*", "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", - "Microsoft.NETCore.Platforms": "1.0.1-*", "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-*" }, "imports": [