Merge branch 'release' into dev

samples/IISSample/project.json

@@ -5,7 +5,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -20,7 +20,9 @@
       "imports": "dnxcore50"
     }
   },
-  "content": [
+  "publishOptions": {
+    "include": [
       "web.config"
     ]
   }
+}

src/Microsoft.AspNetCore.Server.IISIntegration.Tools/project.json

@@ -1,14 +1,15 @@
-{
+{
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true,
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true,
     "outputName": "dotnet-publish-iis"
   },
-
   "dependencies": {
     "Microsoft.Extensions.CommandLineUtils": "1.0.0-*",
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",

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

@@ -1,15 +1,19 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "description": "ASP.NET Core components for working with the IIS AspNetCoreModule.",
+  "packOptions": {
     "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/IISIntegration"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Hosting": "1.0.0-*",

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

@@ -1,10 +1,12 @@
 {
-    "content": [
+  "publishOptions": {
+    "include": [
       "Http.config",
       "Https.config",
       "NtlmAuthentation.config"
-    ],
+    ]
-    "compilationOptions": {
+  },
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {

test/Microsoft.AspNetCore.Server.IISIntegration.Tests/project.json

@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.TestHost": "1.0.0-*",
     "xunit": "2.1.0"
@@ -16,7 +17,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       }
     },

test/Microsoft.AspNetCore.Server.IISIntegration.Tools.Tests/project.json

@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "xunit": "2.1.0",
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-*"
   },
@@ -11,7 +12,6 @@
         "portable-net45+win8"
       ],
       "dependencies": {
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "Microsoft.NETCore.App": {
           "type": "platform",

test/TestSites.Portable/project.json

@@ -1,14 +1,16 @@
-{
+{
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "compile": [
     "../TestSites/Startup*.cs"
   ],
-  "content": [
+  "publishOptions": {
+    "include": [
       "web.config"
-  ],
+    ]
+  },
   "dependencies": {
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",

test/TestSites/project.json

@@ -1,11 +1,13 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
-  "content": [
+  "publishOptions": {
+    "include": [
       "web.config"
-  ],
+    ]
+  },
   "dependencies": {
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",