Merge branch 'release' into dev

test/ServerComparison.FunctionalTests/project.json

@@ -1,21 +1,29 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
-    "warningsAsErrors": true
+    "warningsAsErrors": true,
+    "copyToOutput": {
+      "include": [
+        "Http.config",
+        "nginx.conf",
+        "NtlmAuthentication.config"
+      ]
+    }
   },
   "testRunner": "xunit",
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.AspNetCore.Server.Testing": "1.0.0-*",
     "Microsoft.Extensions.Logging": "1.0.0-*",
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*"
   },
-
+  "publishOptions": {
-  "content": [
+    "include": [
-    "Http.config",
+      "Http.config",
-    "nginx.conf",
+      "nginx.conf",
-    "NtlmAuthentication.config"
+      "NtlmAuthentication.config"
-  ],
+    ]
-
+  },
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {

test/ServerComparison.TestSites.Standalone/project.json

@@ -1,4 +1,4 @@
-{
+{
   "version": "1.0.0-*",
   "dependencies": {
     "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-*",
@@ -13,12 +13,14 @@
   "compile": [
     "../ServerComparison.TestSites/Startup*.cs"
   ],
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
-  "content": [
+  "publishOptions": {
-    "web.config"
+    "include": [
-  ],
+      "web.config"
+    ]
+  },
   "frameworks": {
     "netcoreapp1.0": {
       "imports": [
@@ -40,11 +42,11 @@
     "postpublish": "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%"
   },
   "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": {}
   }
 }

test/ServerComparison.TestSites/project.json

@@ -10,12 +10,14 @@
     "Microsoft.Extensions.Logging.Console": "1.0.0-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
-  "content": [
+  "publishOptions": {
-    "web.config"
+    "include": [
-  ],
+      "web.config"
+    ]
+  },
   "frameworks": {
     "net451": {},
     "netcoreapp1.0": {
@@ -27,7 +29,7 @@
         "Microsoft.NETCore.App": {
           "version": "1.0.0-*",
           "type": "platform"
-        },
+        }
       }
     }
   },