diff --git a/samples/DatabaseErrorPageSample/project.json b/samples/DatabaseErrorPageSample/project.json index c9a37a7e08..affacfd2df 100644 --- a/samples/DatabaseErrorPageSample/project.json +++ b/samples/DatabaseErrorPageSample/project.json @@ -11,7 +11,7 @@ "type": "build" } }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -29,9 +29,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/DeveloperExceptionPageSample/project.json b/samples/DeveloperExceptionPageSample/project.json index bbfefbcb50..4589e29f85 100644 --- a/samples/DeveloperExceptionPageSample/project.json +++ b/samples/DeveloperExceptionPageSample/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -22,9 +22,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/ElmPageSample/project.json b/samples/ElmPageSample/project.json index 18a971a829..aa2c178d61 100644 --- a/samples/ElmPageSample/project.json +++ b/samples/ElmPageSample/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -22,9 +22,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/ExceptionHandlerSample/project.json b/samples/ExceptionHandlerSample/project.json index 2a3287854c..d2c767769a 100644 --- a/samples/ExceptionHandlerSample/project.json +++ b/samples/ExceptionHandlerSample/project.json @@ -6,7 +6,7 @@ "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*", "Microsoft.AspNetCore.StaticFiles": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -23,10 +23,12 @@ } } }, - "content": [ - "wwwroot", - "web.config" - ], + "publishOptions": { + "include": [ + "wwwroot", + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/MiddlewareAnalysisSample/project.json b/samples/MiddlewareAnalysisSample/project.json index 14171acf4f..cdf1697321 100644 --- a/samples/MiddlewareAnalysisSample/project.json +++ b/samples/MiddlewareAnalysisSample/project.json @@ -8,7 +8,7 @@ "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*", "Microsoft.Extensions.Logging.Console": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -25,9 +25,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/RuntimeInfoPageSample/project.json b/samples/RuntimeInfoPageSample/project.json index bbfefbcb50..4589e29f85 100644 --- a/samples/RuntimeInfoPageSample/project.json +++ b/samples/RuntimeInfoPageSample/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -22,9 +22,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/StatusCodePagesSample/project.json b/samples/StatusCodePagesSample/project.json index 60f66c529e..f4d364ae7b 100644 --- a/samples/StatusCodePagesSample/project.json +++ b/samples/StatusCodePagesSample/project.json @@ -1,5 +1,5 @@ { - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "dependencies": { @@ -22,9 +22,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/samples/WelcomePageSample/project.json b/samples/WelcomePageSample/project.json index bbfefbcb50..4589e29f85 100644 --- a/samples/WelcomePageSample/project.json +++ b/samples/WelcomePageSample/project.json @@ -5,7 +5,7 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*" }, - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true }, "frameworks": { @@ -22,9 +22,11 @@ } } }, - "content": [ - "web.config" - ], + "publishOptions": { + "include": [ + "web.config" + ] + }, "tools": { "Microsoft.AspNetCore.Server.IISIntegration.Tools": { "version": "1.0.0-*", diff --git a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json index 31dd441619..aada9a3a32 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics.Abstractions/project.json @@ -1,15 +1,17 @@ { "version": "1.0.0-*", "description": "ASP.NET Core diagnostics middleware abstractions and feature interface definitions.", - "tags": [ - "aspnetcore", - "diagnostics" - ], - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "tags": [ + "aspnetcore", + "diagnostics" + ] }, - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", "nowarn": [ diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json index 1bb2cfbc95..14bdb5dc36 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json @@ -1,11 +1,7 @@ { "version": "0.1.0-*", "description": "ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.", - "tags": [ - "aspnetcore", - "diagnostics" - ], - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", "nowarn": [ @@ -13,9 +9,15 @@ ], "xmlDoc": true }, - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "tags": [ + "aspnetcore", + "diagnostics" + ] }, "dependencies": { "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": { diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json index d033906a5d..514d5ef213 100644 --- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json @@ -1,16 +1,18 @@ { "version": "1.0.0-*", "description": "ASP.NET Core middleware for Entity Framework Core error pages. Use this middleware to detect and diagnose errors with Entity Framework Core migrations.", - "tags": [ - "aspnetcore", - "diagnostics", - "entityframeworkcore" - ], - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "tags": [ + "aspnetcore", + "diagnostics", + "entityframeworkcore" + ] }, - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", "nowarn": [ diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json index 6be1608f12..8188e9ecb5 100644 --- a/src/Microsoft.AspNetCore.Diagnostics/project.json +++ b/src/Microsoft.AspNetCore.Diagnostics/project.json @@ -1,21 +1,30 @@ { "version": "1.0.0-*", "description": "ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware", - "tags": [ - "aspnetcore", - "diagnostics" - ], - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", "nowarn": [ "CS1591" ], - "xmlDoc": true + "xmlDoc": true, + "compile": { + "exclude": [ + "DeveloperExceptionPage/Views/*.cshtml", + "RuntimeInfo/Views/*.cshtml", + "WelcomePage/Views/*.cshtml" + ] + } }, - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "tags": [ + "aspnetcore", + "diagnostics" + ] }, "dependencies": { "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0-*", @@ -39,10 +48,5 @@ "System.Reflection.Extensions": "4.0.1-*" } } - }, - "compileExclude": [ - "DeveloperExceptionPage/Views/*.cshtml", - "RuntimeInfo/Views/*.cshtml", - "WelcomePage/Views/*.cshtml" - ] + } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json index e7f851ff82..aec88a145b 100644 --- a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json +++ b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json @@ -5,4 +5,4 @@ "frameworks": { "netstandard1.0": {} } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json index f174684c6a..cc7ac44186 100644 --- a/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json +++ b/src/Microsoft.AspNetCore.MiddlewareAnalysis/project.json @@ -1,11 +1,7 @@ { "version": "1.0.0-*", "description": "ASP.NET Core middleware for analyzing middleware in the request pipeline with System.Diagnostics.DiagnosticSource.", - "tags": [ - "aspnetcore", - "diagnostics" - ], - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", "nowarn": [ @@ -13,9 +9,15 @@ ], "xmlDoc": true }, - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + }, + "tags": [ + "aspnetcore", + "diagnostics" + ] }, "dependencies": { "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*", diff --git a/src/PageGenerator/project.json b/src/PageGenerator/project.json index cbff970a96..251ec3ac14 100644 --- a/src/PageGenerator/project.json +++ b/src/PageGenerator/project.json @@ -1,14 +1,16 @@ { "version": "1.0.0-*", "description": "Builds the pages for the Diagnostics projects. Runs in build.cmd.", - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, "emitEntryPoint": true, "keyFile": "../../tools/Key.snk" }, - "repository": { - "type": "git", - "url": "git://github.com/aspnet/diagnostics" + "packOptions": { + "repository": { + "type": "git", + "url": "git://github.com/aspnet/diagnostics" + } }, "dependencies": { "Microsoft.AspNetCore.Razor": "1.0.0-*" diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json index e529258822..d483472126 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*", @@ -15,8 +16,7 @@ "Microsoft.NETCore.App": { "version": "1.0.0-*", "type": "platform" - }, - "dotnet-test-xunit": "1.0.0-*" + } }, "imports": [ "dnxcore50", @@ -33,7 +33,7 @@ } } }, - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json index 8472384b29..6d4313977b 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests/project.json @@ -1,8 +1,9 @@ { - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true }, "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-*", @@ -22,7 +23,6 @@ "type": "platform" }, "moq.netcore": "4.4.0-beta8", - "dotnet-test-xunit": "1.0.0-*", "System.Diagnostics.TraceSource": "4.0.0-*" }, "imports": [ diff --git a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json index e6d4a5716c..a118b3bd3b 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.FunctionalTests/project.json @@ -1,5 +1,6 @@ { "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "DatabaseErrorPageSample": "1.0.0", "DeveloperExceptionPageSample": "1.0.0", @@ -29,8 +30,7 @@ "Microsoft.NETCore.App": { "version": "1.0.0-*", "type": "platform" - }, - "dotnet-test-xunit": "1.0.0-*" + } } }, "net451": { diff --git a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json index a3f28b30e1..01c319495a 100644 --- a/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json +++ b/test/Microsoft.AspNetCore.Diagnostics.Tests/project.json @@ -1,9 +1,20 @@ { - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" + "keyFile": "../../tools/Key.snk", + "embed": { + "include": [ + "Resources/**" + ] + }, + "copyToOutput": { + "include": [ + "TestFiles/**/*" + ] + } }, "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.Diagnostics.Elm": "0.1.0-*", @@ -22,7 +33,6 @@ "type": "platform" }, "moq.netcore": "4.4.0-beta8", - "dotnet-test-xunit": "1.0.0-*", "System.Diagnostics.TraceSource": "4.0.0-*" }, "imports": [ @@ -41,11 +51,5 @@ } } }, - "testRunner": "xunit", - "content": [ - "TestFiles/**/*" - ], - "resource": [ - "Resources/**" - ] + "testRunner": "xunit" } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json index 0214729c86..f0576c04ea 100644 --- a/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json +++ b/test/Microsoft.AspNetCore.MiddlewareAnalysis.Tests/project.json @@ -1,8 +1,9 @@ { - "compilationOptions": { + "buildOptions": { "warningsAsErrors": false }, "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.NETCore.Platforms": "1.0.1-*", "Microsoft.AspNetCore.Diagnostics": "1.0.0-*", "Microsoft.AspNetCore.MiddlewareAnalysis": "1.0.0-*", @@ -18,8 +19,7 @@ "Microsoft.NETCore.App": { "version": "1.0.0-*", "type": "platform" - }, - "dotnet-test-xunit": "1.0.0-*" + } }, "imports": [ "dnxcore50",