diff --git a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
index 3ddd6e6caf..71616449d4 100644
--- a/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Abstractions/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,9 +9,11 @@
     "xmlDoc": true
   },
   "description": "ASP.NET 5 Hosting abstractions.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
index 81d474edd1..5add03c85b 100644
--- a/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.Server.Abstractions/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,9 +9,11 @@
     "xmlDoc": true
   },
   "description": "ASP.NET 5 Hosting server abstractions.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Http.Features": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
index 9c97beda69..e3a996cfd5 100644
--- a/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
+++ b/src/Microsoft.AspNetCore.Hosting.WindowsServices/project.json
@@ -1,14 +1,18 @@
 {
   "version": "1.0.0-*",
   "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications running within a Windows service.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "dependencies": {
@@ -21,4 +25,4 @@
       }
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.Hosting/project.json b/src/Microsoft.AspNetCore.Hosting/project.json
index 9d2f40cf32..4926dddc22 100644
--- a/src/Microsoft.AspNetCore.Hosting/project.json
+++ b/src/Microsoft.AspNetCore.Hosting/project.json
@@ -1,11 +1,13 @@
 {
   "version": "1.0.0-*",
   "description": "ASP.NET 5 core hosting infrastructure and startup logic for web applications.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
diff --git a/src/Microsoft.AspNetCore.Server.Testing/project.json b/src/Microsoft.AspNetCore.Server.Testing/project.json
index d328faee03..3b6bbf8fdb 100644
--- a/src/Microsoft.AspNetCore.Server.Testing/project.json
+++ b/src/Microsoft.AspNetCore.Server.Testing/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,9 +9,11 @@
     "xmlDoc": true
   },
   "description": "ASP.NET 5 helpers to deploy applications to IIS Express, IIS, WebListener and Kestrel for testing.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
diff --git a/src/Microsoft.AspNetCore.TestHost/project.json b/src/Microsoft.AspNetCore.TestHost/project.json
index 4178f402fd..0cabef3b92 100644
--- a/src/Microsoft.AspNetCore.TestHost/project.json
+++ b/src/Microsoft.AspNetCore.TestHost/project.json
@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -9,9 +9,11 @@
     "xmlDoc": true
   },
   "description": "ASP.NET 5 web server for writing and running tests.",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/aspnet/hosting"
+  "packOptions": {
+    "repository": {
+      "type": "git",
+      "url": "git://github.com/aspnet/hosting"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Hosting": "1.0.0-*"
diff --git a/test/Microsoft.AspNetCore.Hosting.Tests/project.json b/test/Microsoft.AspNetCore.Hosting.Tests/project.json
index a448feacd4..879fd8a621 100644
--- a/test/Microsoft.AspNetCore.Hosting.Tests/project.json
+++ b/test/Microsoft.AspNetCore.Hosting.Tests/project.json
@@ -1,12 +1,20 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
-    "keyFile": "../../tools/Key.snk"
+    "keyFile": "../../tools/Key.snk",
+    "copyToOutput": {
+      "include": [
+        "testroot/**/*"
+      ]
+    }
+  },
+  "publishOptions": {
+    "include": [
+      "testroot/**/*"
+    ]
   },
-  "content": [
-    "testroot/**/*"
-  ],
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Hosting": "1.0.0-*",
     "Microsoft.AspNetCore.Owin": "1.0.0-*",
@@ -22,7 +30,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [
diff --git a/test/Microsoft.AspNetCore.TestHost.Tests/project.json b/test/Microsoft.AspNetCore.TestHost.Tests/project.json
index 1489fff90e..9c82d1c294 100644
--- a/test/Microsoft.AspNetCore.TestHost.Tests/project.json
+++ b/test/Microsoft.AspNetCore.TestHost.Tests/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.TestHost": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
@@ -17,7 +18,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [