Merge branch 'release' into dev

samples/IISSample/project.json

@@ -5,11 +5,11 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netcoreapp1.0": {
       "dependencies": {
         "Microsoft.NETCore.App": {
@@ -20,7 +20,9 @@
       "imports": "dnxcore50"
     }
   },
-  "content": [
+  "publishOptions": {
-    "web.config"
+    "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-*",
@@ -27,4 +28,4 @@
       }
     }
   }
-}
+}

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.",
-  "repository": {
+  "packOptions": {
+    "repository": {
       "type": "git",
       "url": "git://github.com/aspnet/IISIntegration"
+    }
   },
   "dependencies": {
     "Microsoft.AspNetCore.Hosting": "1.0.0-*",
@@ -24,7 +28,7 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.Security.Principal.Windows": "4.0.0-*"
@@ -35,4 +39,4 @@
       ]
     }
   }
-}
+}

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

@@ -1,31 +1,33 @@
 {
-    "content": [
+  "publishOptions": {
-        "Http.config",
+    "include": [
-        "Https.config",
+      "Http.config",
-        "NtlmAuthentation.config"
+      "Https.config",
-    ],
+      "NtlmAuthentation.config"
-    "compilationOptions": {
+    ]
-        "warningsAsErrors": true
+  },
-    },
+  "buildOptions": {
-    "dependencies": {
+    "warningsAsErrors": true
-        "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
+  },
-        "Microsoft.Extensions.Logging": "1.0.0-*",
+  "dependencies": {
-        "Microsoft.Extensions.Logging.Console": "1.0.0-*",
+    "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
-        "xunit": "2.1.0"
+    "Microsoft.Extensions.Logging": "1.0.0-*",
-    },
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "frameworks": {
+    "xunit": "2.1.0"
-        "net451": {
+  },
-            "dependencies": {
+  "frameworks": {
-                "xunit.runner.console": "2.1.0"
+    "net451": {
-            },
+      "dependencies": {
-            "frameworkAssemblies": {
+        "xunit.runner.console": "2.1.0"
-                "System.Data": "",
+      },
-                "System.Net.Http": "",
+      "frameworkAssemblies": {
-                "System.Net.Http.WebRequest": "",
+        "System.Data": "",
-                "System.Runtime": "",
+        "System.Net.Http": "",
-                "System.Xml": ""
+        "System.Net.Http.WebRequest": "",
-            }
+        "System.Runtime": "",
-        }
+        "System.Xml": ""
-    },
+      }
-    "testRunner": "xunit"
+    }
-}
+  },
+  "testRunner": "xunit"
+}

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",
@@ -21,4 +21,4 @@
     }
   },
   "testRunner": "xunit"
-}
+}

test/TestSites.Portable/project.json

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

test/TestSites/project.json

@@ -1,11 +1,13 @@
 {
   "version": "1.0.0-*",
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
-  "content": [
+  "publishOptions": {
-    "web.config"
+    "include": [
-  ],
+      "web.config"
+    ]
+  },
   "dependencies": {
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
@@ -28,14 +30,14 @@
         "System.Diagnostics.Process": "4.1.0-*"
       }
     },
-    "net451": { }
+    "net451": {}
   },
   "runtimes": {
-    "win7-x64": { },
+    "win7-x64": {},
-    "win7-x86": { },
+    "win7-x86": {},
-    "osx.10.10-x64": { },
+    "osx.10.10-x64": {},
-    "osx.10.11-x64": { },
+    "osx.10.11-x64": {},
-    "ubuntu.14.04-x64": { },
+    "ubuntu.14.04-x64": {},
-    "ubuntu.15.04-x64": { }
+    "ubuntu.15.04-x64": {}
   }
-}
+}