Merge branch 'release' into dev

samples/StaticFileSample/project.json

@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {
@@ -23,10 +23,12 @@
       ]
     }
   },
-  "content": [
-    "wwwroot",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",

src/Microsoft.AspNetCore.StaticFiles/project.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,13 +9,15 @@
     "xmlDoc": true
   },
   "description": "ASP.NET Core static files middleware. Includes middleware for serving static files, directory browsing, and default files.",
-  "tags": [
-    "aspnetcore",
-    "staticfiles"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/staticfiles"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/staticfiles"
+    },
+    "tags": [
+      "aspnetcore",
+      "staticfiles"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",

test/Microsoft.AspNetCore.StaticFiles.Tests/project.json

@@ -1,13 +1,16 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
-  "content": [
-    "SubFolder/**/*",
-    "TestDocument.txt"
-  ],
+  "publishOptions": {
+    "include": [
+      "SubFolder/**/*",
+      "TestDocument.txt"
+    ]
+  },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
     "Microsoft.AspNetCore.TestHost": "1.0.0-*",
@@ -22,7 +25,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [