Merge branch 'release' into dev

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": [
+  "publishOptions": {
-    "Areas",
+    "include": [
-    "Views",
+      "Areas",
-    "wwwroot",
+      "Views",
-    "config.json",
+      "wwwroot",
-    "web.config"
+      "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-x64": {},
-    "win7-x86": { },
+    "win7-x86": {},
-    "osx.10.10-x64": { },
+    "osx.10.10-x64": {},
-    "osx.10.11-x64": { },
+    "osx.10.11-x64": {},
-    "ubuntu.14.04-x64": { },
+    "ubuntu.14.04-x64": {},
-    "ubuntu.15.04-x64": { }
+    "ubuntu.15.04-x64": {}
   }
 }

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": [
@@ -19,13 +19,15 @@
   "compile": [
     "../../shared/**/*.cs"
   ],
-  "content": [
+  "publishOptions": {
-    "Areas",
+    "include": [
-    "Views",
+      "Areas",
-    "wwwroot",
+      "Views",
-    "config.json",
+      "wwwroot",
-    "web.config"
+      "config.json",
-  ],
+      "web.config"
+    ]
+  },
   "dependencies": {
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.Facebook": "1.0.0-*",
@@ -53,7 +55,7 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {

test/E2ETests/project.json

@@ -1,11 +1,12 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "compile": [
     "../../shared/**/*.cs"
   ],
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-*",
     "Microsoft.AspNetCore.Authentication.OpenIdConnect": "0.1.0-*",
     "Microsoft.AspNetCore.Identity": "1.0.0-*",
@@ -25,7 +26,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-*"
       },

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": {}