diff --git a/samples/ActionConstraintSample.Web/project.json b/samples/ActionConstraintSample.Web/project.json
index dcc287a68c..46116d2574 100644
--- a/samples/ActionConstraintSample.Web/project.json
+++ b/samples/ActionConstraintSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,9 +24,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/CustomRouteSample.Web/project.json b/samples/CustomRouteSample.Web/project.json
index dcc287a68c..46116d2574 100644
--- a/samples/CustomRouteSample.Web/project.json
+++ b/samples/CustomRouteSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,9 +24,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/EmbeddedViewSample.Web/project.json b/samples/EmbeddedViewSample.Web/project.json
index 9d088a44f2..6d69b2840d 100644
--- a/samples/EmbeddedViewSample.Web/project.json
+++ b/samples/EmbeddedViewSample.Web/project.json
@@ -1,9 +1,11 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+    "embed": {
+      "include": "EmbeddedResources/**"
+    }
   },
-  "resource": "EmbeddedResources/**",
   "dependencies": {
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -12,7 +14,7 @@
     "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -26,9 +28,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/FormatFilterSample.Web/project.json b/samples/FormatFilterSample.Web/project.json
index f674e6d9f1..07615f1f23 100644
--- a/samples/FormatFilterSample.Web/project.json
+++ b/samples/FormatFilterSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -11,7 +11,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -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/InlineConstraintSample.Web/project.json b/samples/InlineConstraintSample.Web/project.json
index 6176d0634a..593a541fd2 100644
--- a/samples/InlineConstraintSample.Web/project.json
+++ b/samples/InlineConstraintSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,10 +24,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/JsonPatchSample.Web/project.json b/samples/JsonPatchSample.Web/project.json
index 81505cbad2..1f1c9ab158 100644
--- a/samples/JsonPatchSample.Web/project.json
+++ b/samples/JsonPatchSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,10 +24,12 @@
       }
     }
   },
-  "content": [
-    "wwwroot",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "wwwroot",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/LocalizationSample.Web/project.json b/samples/LocalizationSample.Web/project.json
index 6176d0634a..593a541fd2 100644
--- a/samples/LocalizationSample.Web/project.json
+++ b/samples/LocalizationSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,10 +24,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json
index 878172d656..e66bb15259 100644
--- a/samples/MvcSandbox/project.json
+++ b/samples/MvcSandbox/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "warningsAsErrors": true,
     "preserveCompilationContext": true
@@ -18,11 +18,13 @@
     "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
-  "content": [
-    "Views",
-    "web.config",
-    "wwwroot"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config",
+      "wwwroot"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Razor.Tools": {
       "version": "1.0.0-*",
@@ -32,7 +34,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
diff --git a/samples/MvcSubAreaSample.Web/project.json b/samples/MvcSubAreaSample.Web/project.json
index 2b20e0c35d..5c1949bbd4 100644
--- a/samples/MvcSubAreaSample.Web/project.json
+++ b/samples/MvcSubAreaSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -16,7 +16,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -30,11 +30,13 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "Areas",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "Areas",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/samples/TagHelperSample.Web/project.json b/samples/TagHelperSample.Web/project.json
index 5ccf070c3b..9a5005f4ee 100644
--- a/samples/TagHelperSample.Web/project.json
+++ b/samples/TagHelperSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "warningsAsErrors": true,
     "preserveCompilationContext": true
@@ -30,7 +30,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -44,11 +44,13 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "wwwroot",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "wwwroot",
+      "web.config"
+    ]
+  },
   "scripts": {
     "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
   }
diff --git a/samples/UrlHelperSample.Web/project.json b/samples/UrlHelperSample.Web/project.json
index deb62ea621..cedc7dcecd 100644
--- a/samples/UrlHelperSample.Web/project.json
+++ b/samples/UrlHelperSample.Web/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,10 +24,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host.VSRC1/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host.VSRC1/project.json
index 8526f3f05c..a5bfe2ef64 100644
--- a/src/Microsoft.AspNet.Mvc.Razor.Host.VSRC1/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor.Host.VSRC1/project.json
@@ -1,11 +1,13 @@
 {
   "description": "Design time hosting infrastructure for the ASP.NET MVC Razor view engine.",
   "version": "6.0.0-rc1-final",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
index e543174f1b..61595cb1eb 100644
--- a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.IActionResult",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -38,7 +40,7 @@
     "Microsoft.Net.Http.Headers": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "Microsoft.CSharp": "4.0.1-*",
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
index 67a0f82e63..f47a44aee2 100644
--- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -29,7 +31,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net451+win8"
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/project.json b/src/Microsoft.AspNetCore.Mvc.Core/project.json
index 5ac10d56f0..08ef1983b7 100644
--- a/src/Microsoft.AspNetCore.Mvc.Core/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC core components. Contains common action result types, attribute routing, application model conventions, API explorer, application parts, filters, formatters, model binding, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.AreaAttribute\r\nMicrosoft.AspNetCore.Mvc.BindAttribute\r\nMicrosoft.AspNetCore.Mvc.ControllerBase\r\nMicrosoft.AspNetCore.Mvc.FromBodyAttribute\r\nMicrosoft.AspNetCore.Mvc.FromFormAttribute\r\nMicrosoft.AspNetCore.Mvc.RequireHttpsAttribute\r\nMicrosoft.AspNetCore.Mvc.RouteAttribute",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -54,7 +56,7 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net451+win8"
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json
index a0d3fc357d..41aa898e94 100644
--- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json
@@ -1,16 +1,18 @@
 {
   "description": "ASP.NET Core MVC cross-origin resource sharing (CORS) features.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "cors"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "cors"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -23,7 +25,7 @@
     "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net451+win8"
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
index 26eefb997e..4e4a1282c6 100644
--- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
index 093f80d9fc..2878ba60b4 100644
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
@@ -1,16 +1,18 @@
 {
   "description": "ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "json"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "json"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -27,7 +29,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net451+win8"
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
index 6bb00acb95..9e633c76af 100644
--- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
@@ -1,16 +1,18 @@
 {
   "description": "ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "xml"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "xml"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/project.json b/src/Microsoft.AspNetCore.Mvc.Localization/project.json
index 87a91ac04a..d2f123d9e4 100644
--- a/src/Microsoft.AspNetCore.Mvc.Localization/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Localization/project.json
@@ -1,12 +1,7 @@
 {
   "description": "ASP.NET Core MVC features that enable globalization and localization of applications.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<TResource>\r\nMicrosoft.AspNetCore.Mvc.Localization.IViewLocalizer",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "localization"
-  ],
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -25,7 +20,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net45+win8"
@@ -37,8 +32,15 @@
     "node_modules",
     "bower_components"
   ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "https://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "localization"
+    ]
   }
 }
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
index de6c8a7e96..f9889a46eb 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
@@ -1,17 +1,19 @@
 {
   "description": "ASP.NET Core MVC design time hosting infrastructure for the Razor view engine.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "cshtml",
-    "razor"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "cshtml",
+      "razor"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -29,7 +31,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "dependencies": {
         "System.Collections.Concurrent": "4.0.12-*",
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json
index 4fe5b3ec0d..002ff42761 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/project.json
@@ -1,17 +1,19 @@
 {
   "description": "ASP.NET Core MVC Razor view engine for CSHTML files.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "cshtml",
-    "razor"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "cshtml",
+      "razor"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
index 7cdc55dea2..1557ddb320 100644
--- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
@@ -1,17 +1,19 @@
 {
   "description": "ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "taghelper",
-    "taghelpers"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "taghelper",
+      "taghelpers"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -38,7 +40,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net45+win8"
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
index 90d55940fb..3318d23d09 100644
--- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Controller\r\nMicrosoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute\r\nMicrosoft.AspNetCore.Mvc.ViewComponent",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -49,7 +51,7 @@
     "System.Buffers": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "dependencies": {
         "System.Runtime.Serialization.Primitives": "4.1.1-*"
diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
index 66fbe5dddb..d27a52780f 100644
--- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
+++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
@@ -1,16 +1,18 @@
 {
   "description": "Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.\r\nCommonly used types:\r\nSystem.Web.Http.ApiController",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc",
-    "aspnetwebapi"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc",
+      "aspnetwebapi"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.Mvc/project.json b/src/Microsoft.AspNetCore.Mvc/project.json
index d45e1a3f0d..691956d0e5 100644
--- a/src/Microsoft.AspNetCore.Mvc/project.json
+++ b/src/Microsoft.AspNetCore.Mvc/project.json
@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and web APIs. ASP.NET Core MVC enables a clean separation of concerns and gives you full control over markup.",
-  "tags": [
-    "aspnetcore",
-    "aspnetcoremvc"
-  ],
   "version": "1.0.0-*",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/mvc"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/mvc"
+    },
+    "tags": [
+      "aspnetcore",
+      "aspnetcoremvc"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -34,7 +36,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
         "portable-net451+win8"
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
index 2b51a86051..e803cc1aaf 100644
--- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*"
@@ -21,7 +22,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
index ef019ccd8a..54c7bca971 100644
--- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
@@ -26,7 +27,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
index 6fc1ba4199..aaacbbef6f 100644
--- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json
@@ -1,10 +1,11 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "preserveCompilationContext": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -36,7 +37,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
index f42a155a6b..4bb70c0f94 100644
--- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -28,7 +29,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
index 1ada0d1389..0e90de3c6a 100644
--- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
@@ -28,7 +29,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
index f42a155a6b..4bb70c0f94 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -28,7 +29,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
index 9679f9bf98..aa390b69fd 100644
--- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -27,7 +28,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
index 4c7e306e30..a9109193bc 100644
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json
@@ -2,7 +2,7 @@
   "compile": [
     "../Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs"
   ],
-  "compilationOptions": {
+  "buildOptions": {
     "define": [
       "__RemoveThisBitTo__GENERATE_BASELINES",
       "FUNCTIONAL_TESTS"
@@ -10,6 +10,7 @@
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "ActionConstraintSample.Web": "1.0.0",
     "ApiExplorerWebSite": "1.0.0",
@@ -62,7 +63,6 @@
         },
         "Microsoft.Dnx.Compilation.CSharp.Common": "1.0.0-*",
         "Microsoft.Dnx.Compilation.CSharp.Abstractions": "1.0.0-*",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [
@@ -70,11 +70,6 @@
         "portable-net451+win8"
       ]
     },
-    "net451": { }
-  },
-  "exclude": [
-    "wwwroot",
-    "node_modules",
-    "bower_components"
-  ]
+    "net451": {}
+  }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
index 1faca9bb17..07c0f252f3 100644
--- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -27,7 +28,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
index e1a4874d84..0e83d78e33 100644
--- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
@@ -26,7 +27,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
index ed90eea50a..c4be1f865f 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json
@@ -1,6 +1,6 @@
 {
-  "resource": "TestFiles/**",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc.Core": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.0-*",
@@ -15,11 +15,22 @@
     "Microsoft.AspNetCore.Testing": "1.0.0-*"
   },
   "testRunner": "xunit",
-  "compilationOptions": {
+  "buildOptions": {
     "define": [
       "__RemoveThisBitTo__GENERATE_BASELINES"
     ],
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "embed": {
+      "include": "TestFiles/**"
+    },
+    "compile": {
+      "include": "**/*.cs",
+      "exclude": [
+        "TestFiles/**",
+        "bin",
+        "obj"
+      ]
+    }
   },
   "frameworks": {
     "netcoreapp1.0": {
@@ -33,7 +44,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
@@ -43,10 +53,5 @@
         "Moq": "4.2.1312.1622"
       }
     }
-  },
-  "exclude": [
-    "wwwroot",
-    "node_modules",
-    "bower_components"
-  ]
+  }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
index 7f16f4326c..ad9a1cffc3 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "preserveCompilationContext": true,
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
@@ -11,6 +11,7 @@
     "../Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Internal/TestViewBufferScope.cs"
   ],
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -43,7 +44,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
index 538d79afc7..0581a0e091 100644
--- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.0-*",
@@ -30,7 +31,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
@@ -40,10 +40,5 @@
         "Moq": "4.2.1312.1622"
       }
     }
-  },
-  "exclude": [
-    "wwwroot",
-    "node_modules",
-    "bower_components"
-  ]
+  }
 }
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json
index bc2f7315c2..a96e53ee80 100644
--- a/test/Microsoft.AspNetCore.Mvc.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.0-*",
@@ -23,7 +24,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
index 9dcb98e42c..46005efda0 100644
--- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json
@@ -1,9 +1,10 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc": "1.0.0-*",
@@ -34,7 +35,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
index 2a8c7dcab7..c11f84537f 100644
--- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
+++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json
@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.0-*",
@@ -27,7 +28,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       }
diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json
index d4d822ec16..212da43222 100644
--- a/test/WebSites/ApiExplorerWebSite/project.json
+++ b/test/WebSites/ApiExplorerWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -27,9 +27,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json
index fc50c3bcc7..58138a32e4 100644
--- a/test/WebSites/ApplicationModelWebSite/project.json
+++ b/test/WebSites/ApplicationModelWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -12,7 +12,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -26,9 +26,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json
index 231a3d0424..6ec0915077 100644
--- a/test/WebSites/BasicWebSite/project.json
+++ b/test/WebSites/BasicWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -18,7 +18,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -32,11 +32,13 @@
       }
     }
   },
-  "content": [
-    "Areas/Area1/Views",
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Areas/Area1/Views",
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json
index d7a938fa72..224718137b 100644
--- a/test/WebSites/ControllersFromServicesClassLibrary/project.json
+++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json
@@ -3,13 +3,13 @@
     "Microsoft.AspNetCore.Mvc": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
         "portable-net451+win8"
       ],
-      "dependencies": { }
+      "dependencies": {}
     }
   }
 }
\ No newline at end of file
diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json
index a21d18ad09..cd61795fce 100644
--- a/test/WebSites/ControllersFromServicesWebSite/project.json
+++ b/test/WebSites/ControllersFromServicesWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -17,7 +17,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -31,10 +31,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json
index 6ce7a73adf..5c8594cd86 100644
--- a/test/WebSites/CorsWebSite/project.json
+++ b/test/WebSites/CorsWebSite/project.json
@@ -1,11 +1,13 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "dependencies": {
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -17,7 +19,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json
index 48b6b73229..25dc7146e7 100644
--- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json
+++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -27,10 +27,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json
index ed8e7e6adc..dc071e6977 100644
--- a/test/WebSites/FilesWebSite/project.json
+++ b/test/WebSites/FilesWebSite/project.json
@@ -1,9 +1,11 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
-    "preserveCompilationContext": true
+    "preserveCompilationContext": true,
+    "embed": {
+      "include": "EmbeddedResources/**"
+    }
   },
-  "resource": "EmbeddedResources/**",
   "dependencies": {
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -14,7 +16,7 @@
     "Microsoft.Extensions.FileProviders.Embedded": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -28,10 +30,12 @@
       }
     }
   },
-  "content": [
-    "sample.txt",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "sample.txt",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json
index d07c15110f..b44c494a15 100644
--- a/test/WebSites/FiltersWebSite/project.json
+++ b/test/WebSites/FiltersWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -14,7 +14,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -28,9 +28,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json
index d4d822ec16..212da43222 100644
--- a/test/WebSites/FormatterWebSite/project.json
+++ b/test/WebSites/FormatterWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -27,9 +27,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json
index 2e6397b2f2..6e229f2ba7 100644
--- a/test/WebSites/HtmlGenerationWebSite/project.json
+++ b/test/WebSites/HtmlGenerationWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -16,7 +16,7 @@
     "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -30,11 +30,13 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "wwwroot",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "wwwroot",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
index a2864eb68d..80b599a995 100644
--- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
+++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json
@@ -14,7 +14,7 @@
         "portable-net451+win8"
       ],
       "dependencies": {
-          "NETStandard.Library": "1.5.0-*"
+        "NETStandard.Library": "1.5.0-*"
       }
     }
   }
diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
index c7e782ba06..49e56b1921 100644
--- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.Extensions.DiagnosticAdapter": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -27,10 +27,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json
index a0ebcba50f..7e9a2b2f97 100644
--- a/test/WebSites/RazorWebSite/project.json
+++ b/test/WebSites/RazorWebSite/project.json
@@ -1,13 +1,15 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
-  "content": [
-    "Views",
-    "Shared-Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "Shared-Views",
+      "web.config"
+    ]
+  },
   "dependencies": {
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Localization": "1.0.0-*",
@@ -20,14 +22,14 @@
   },
   "frameworks": {
     "net451": {
-      "compilationOptions": {
+      "buildOptions": {
         "define": [
           "NET451_CUSTOM_DEFINE"
         ]
       }
     },
     "netcoreapp1.0": {
-      "compilationOptions": {
+      "buildOptions": {
         "define": [
           "NETCOREAPP1_0_CUSTOM_DEFINE"
         ]
diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json
index d0cf483391..435e7f3814 100644
--- a/test/WebSites/RoutingWebSite/project.json
+++ b/test/WebSites/RoutingWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -12,7 +12,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -26,9 +26,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json
index f651f82eb6..7ec4b4a41a 100644
--- a/test/WebSites/SimpleWebSite/project.json
+++ b/test/WebSites/SimpleWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -10,7 +10,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -24,9 +24,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json
index 23740a6f27..3c9876ba7c 100644
--- a/test/WebSites/TagHelpersWebSite/project.json
+++ b/test/WebSites/TagHelpersWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "allowUnsafe": true,
     "emitEntryPoint": true,
     "warningsAsErrors": true,
@@ -19,7 +19,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -33,10 +33,12 @@
       }
     }
   },
-  "content": [
-    "Views",
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "Views",
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json
index d0cf483391..435e7f3814 100644
--- a/test/WebSites/VersioningWebSite/project.json
+++ b/test/WebSites/VersioningWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -12,7 +12,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -26,9 +26,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json
index 74d3d764c6..7d341d5fef 100644
--- a/test/WebSites/WebApiCompatShimWebSite/project.json
+++ b/test/WebSites/WebApiCompatShimWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -29,9 +29,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",
diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json
index 441aea55ac..eb7d65d142 100644
--- a/test/WebSites/XmlFormattersWebSite/project.json
+++ b/test/WebSites/XmlFormattersWebSite/project.json
@@ -1,5 +1,5 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "preserveCompilationContext": true
   },
@@ -13,7 +13,7 @@
     "Microsoft.AspNetCore.StaticFiles": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "imports": [
         "dnxcore50",
@@ -28,9 +28,11 @@
       }
     }
   },
-  "content": [
-    "web.config"
-  ],
+  "publishOptions": {
+    "include": [
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",