From 59d905ae3baed7621915d21d2cb49c1bf2295191 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 2 May 2016 11:27:20 -0700 Subject: [PATCH] Fix build warnings --- src/MusicStore.Standalone/project.json | 30 ++++++++++++++------------ src/MusicStore/project.json | 20 +++++++++-------- test/E2ETests/project.json | 4 ++-- test/MusicStore.Test/project.json | 6 +++--- 4 files changed, 32 insertions(+), 28 deletions(-) diff --git a/src/MusicStore.Standalone/project.json b/src/MusicStore.Standalone/project.json index cdcd399f12..f6dff22122 100644 --- a/src/MusicStore.Standalone/project.json +++ b/src/MusicStore.Standalone/project.json @@ -4,7 +4,7 @@ ], "description": "Music store application on ASP.NET 5", "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, "warningsAsErrors": true, "define": [ @@ -22,13 +22,15 @@ "../MusicStore/bin", "../MusicStore/obj" ], - "content": [ - "Areas", - "Views", - "wwwroot", - "config.json", - "web.config" - ], + "publishOptions": { + "include": [ + "Areas", + "Views", + "wwwroot", + "config.json", + "web.config" + ] + }, "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*", @@ -77,11 +79,11 @@ "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" }, "runtimes": { - "win7-x64": { }, - "win7-x86": { }, - "osx.10.10-x64": { }, - "osx.10.11-x64": { }, - "ubuntu.14.04-x64": { }, - "ubuntu.15.04-x64": { } + "win7-x64": {}, + "win7-x86": {}, + "osx.10.10-x64": {}, + "osx.10.11-x64": {}, + "ubuntu.14.04-x64": {}, + "ubuntu.15.04-x64": {} } } \ No newline at end of file diff --git a/src/MusicStore/project.json b/src/MusicStore/project.json index 6cb8341204..1f3b087de5 100644 --- a/src/MusicStore/project.json +++ b/src/MusicStore/project.json @@ -4,7 +4,7 @@ ], "description": "Music store application on ASP.NET 5", "version": "1.0.0-*", - "compilationOptions": { + "buildOptions": { "emitEntryPoint": true, "warningsAsErrors": true, "define": [ @@ -16,13 +16,15 @@ "compile": [ "../../shared/**/*.cs" ], - "content": [ - "Areas", - "Views", - "wwwroot", - "config.json", - "web.config" - ], + "publishOptions": { + "include": [ + "Areas", + "Views", + "wwwroot", + "config.json", + "web.config" + ] + }, "dependencies": { "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*", @@ -50,7 +52,7 @@ "Microsoft.NETCore.Platforms": "1.0.1-*" }, "frameworks": { - "net451": { }, + "net451": {}, "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { diff --git a/test/E2ETests/project.json b/test/E2ETests/project.json index dda81f641f..c5149b79dc 100644 --- a/test/E2ETests/project.json +++ b/test/E2ETests/project.json @@ -1,11 +1,12 @@ { - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true }, "compile": [ "../../shared/**/*.cs" ], "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.AspNetCore.Identity": "1.0.0-*", "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*", "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*", @@ -22,7 +23,6 @@ "version": "1.0.0-*", "type": "platform" }, - "dotnet-test-xunit": "1.0.0-*", "System.Data.SqlClient": "4.1.0-*", "System.Xml.XmlDocument": "4.0.1-*" }, diff --git a/test/MusicStore.Test/project.json b/test/MusicStore.Test/project.json index ed65149a82..c45fb72442 100644 --- a/test/MusicStore.Test/project.json +++ b/test/MusicStore.Test/project.json @@ -1,8 +1,9 @@ { - "compilationOptions": { + "buildOptions": { "warningsAsErrors": true }, "dependencies": { + "dotnet-test-xunit": "1.0.0-*", "Microsoft.Extensions.Logging.Testing": "1.0.0-*", "MusicStore": "1.0.0-*", "XUnit": "2.1.0" @@ -17,8 +18,7 @@ "Microsoft.NETCore.App": { "version": "1.0.0-*", "type": "platform" - }, - "dotnet-test-xunit": "1.0.0-*" + } } }, "net451": {}