Merge branch 'release' into dev

samples/RoutingSample.Web/project.json

@@ -5,7 +5,7 @@
     "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
     "Microsoft.AspNetCore.Routing": "1.0.0-*"
   },
-  "compilationOptions": {
+  "buildOptions": {
     "emitEntryPoint": true
   },
   "frameworks": {
@@ -22,9 +22,11 @@
       ]
     }
   },
-  "content": [
+  "publishOptions": {
-    "web.config"
+    "include": [
-  ],
+      "web.config"
+    ]
+  },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
       "version": "1.0.0-*",

src/Microsoft.AspNetCore.Routing.Abstractions/project.json

@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core abstractions for routing requests to application logic and for generating links.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Routing.IRouteHandler\r\nMicrosoft.AspNetCore.Routing.RouteData.",
-  "tags": [
-    "aspnetcore",
-    "routing"
-  ],
   "version": "1.0.0-*",
-  "repository": {
+  "packOptions": {
-    "type": "git",
+    "repository": {
-    "url": "git://github.com/aspnet/routing"
+      "type": "git",
+      "url": "git://github.com/aspnet/routing"
+    },
+    "tags": [
+      "aspnetcore",
+      "routing"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json

@@ -1,11 +1,13 @@
 {
   "description": "Components for building a DecisionTree.",
   "version": "1.0.0-*",
-  "repository": {
+  "packOptions": {
-    "type": "git",
+    "repository": {
-    "url": "git://github.com/aspnet/routing"
+      "type": "git",
+      "url": "git://github.com/aspnet/routing"
+    }
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk"
   },

src/Microsoft.AspNetCore.Routing/project.json

@@ -1,15 +1,17 @@
 {
   "description": "ASP.NET Core middleware for routing requests to application logic and for generating links.\r\nCommonly used types:\r\n Microsoft.AspNetCore.Routing.Route\r\nMicrosoft.AspNetCore.Routing.RouteCollection",
-  "tags": [
-    "aspnetcore",
-    "routing"
-  ],
   "version": "1.0.0-*",
-  "repository": {
+  "packOptions": {
-    "type": "git",
+    "repository": {
-    "url": "git://github.com/aspnet/routing"
+      "type": "git",
+      "url": "git://github.com/aspnet/routing"
+    },
+    "tags": [
+      "aspnetcore",
+      "routing"
+    ]
   },
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [

test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.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.Routing.Abstractions": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
@@ -17,7 +18,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       },

test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json

@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Routing": "1.0.0-*",
     "Microsoft.AspNetCore.Routing.DecisionTree.Sources": {
@@ -19,7 +20,6 @@
           "version": "1.0.0-*",
           "type": "platform"
         },
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

test/Microsoft.AspNetCore.Routing.Tests/project.json

@@ -1,8 +1,9 @@
 {
-  "compilationOptions": {
+  "buildOptions": {
     "warningsAsErrors": true
   },
   "dependencies": {
+    "dotnet-test-xunit": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Routing": "1.0.0-*",
@@ -21,7 +22,6 @@
           "type": "platform"
         },
         "moq.netcore": "4.4.0-beta8",
-        "dotnet-test-xunit": "1.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
         "System.Diagnostics.TraceSource": "4.0.0-*"
       },