Merge branch 'release' into dev

samples/LargeResponseApp/project.json

@@ -4,7 +4,7 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -21,7 +21,9 @@
       ]
     }
   },
-  "content": [
+  "publishOptions": {
-    "hosting.json"
+    "include": [
-  ]
+      "hosting.json"
+    ]
+  }
 }

samples/SampleApp/project.json

@@ -6,7 +6,7 @@
     "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -24,8 +24,10 @@
       ]
     }
   },
-  "content": [
+  "publishOptions": {
-    "hosting.json",
+    "include": [
-    "testCert.pfx"
+      "hosting.json",
-  ]
+      "testCert.pfx"
+    ]
+  }
 }

src/Microsoft.AspNetCore.Server.Kestrel.Https/project.json

@@ -1,26 +1,28 @@
 {
   "version": "1.0.0-*",
   "description": "HTTPS support for the ASP.NET Core Kestrel cross-platform web server.",
-  "tags": [
+  "buildOptions": {
-    "aspnetcore",
-    "kestrel"
-  ],
-  "compilationOptions": {
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
       "CS1591"
     ],
     "xmlDoc": true
   },
-  "repository": {
+  "packOptions": {
-    "type": "git",
+    "repository": {
-    "url": "git://github.com/aspnet/kestrelhttpserver"
+      "type": "git",
+      "url": "git://github.com/aspnet/kestrelhttpserver"
+    },
+    "tags": [
+      "aspnetcore",
+      "kestrel"
+    ]
   },
   "dependencies": {
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.Net.Security": "4.0.0-*"

src/Microsoft.AspNetCore.Server.Kestrel/project.json

@@ -1,13 +1,15 @@
 {
   "version": "1.0.0-*",
   "description": "ASP.NET Core Kestrel cross-platform web server.",
-  "tags": [
+  "packOptions": {
-    "aspnetcore",
+    "repository": {
-    "kestrel"
+      "type": "git",
-  ],
+      "url": "git://github.com/aspnet/kestrelhttpserver"
-  "repository": {
+    },
-    "type": "git",
+    "tags": [
-    "url": "git://github.com/aspnet/kestrelhttpserver"
+      "aspnetcore",
+      "kestrel"
+    ]
   },
   "dependencies": {
     "System.Buffers": "4.0.0-*",
@@ -51,7 +53,7 @@
       ]
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "allowUnsafe": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/project.json

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -16,7 +17,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Net.Http": "4.0.1-*",
         "System.Runtime.Serialization.Primitives": "4.1.1-*"
       },
@@ -35,7 +35,7 @@
       }
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "allowUnsafe": true
   },
   "testRunner": "xunit"

test/Microsoft.AspNetCore.Server.Kestrel.TestCommon/project.json

@@ -1,7 +1,7 @@
 {
   "version": "1.0.0-*",
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.Threading": "4.0.11-*",
@@ -12,7 +12,7 @@
       ]
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "keyFile": "../../tools/Key.snk"
   }
 }

test/Microsoft.AspNetCore.Server.KestrelTests/project.json

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel.Https": "1.0.0-*",
@@ -21,8 +22,7 @@
         "System.Net.Http": "4.0.1-*",
         "System.Net.Http.WinHttpHandler": "4.0.0-*",
         "System.Net.Sockets": "4.1.0-*",
-        "System.Runtime.Handles": "4.0.1-*",
+        "System.Runtime.Handles": "4.0.1-*"
-        "dotnet-test-xunit": "1.0.0-*"
       },
       "imports": [
         "dnxcore50",
@@ -38,12 +38,14 @@
       }
     }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "allowUnsafe": true,
     "keyFile": "../../tools/Key.snk"
   },
   "testRunner": "xunit",
-  "content": [
+  "publishOptions": {
-    "TestResources/testCert.pfx"
+    "include": [
-  ]
+      "TestResources/testCert.pfx"
+    ]
+  }
 }

tools/Microsoft.AspNetCore.Server.Kestrel.GeneratedCode/project.json

@@ -1,6 +1,6 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "dependencies": {