Merge branch 'release' into dev

davidfowl · davidfowl · commit 5696f3fd5d3c · 2014-10-31T01:39:06.000-07:00
diff --git a/src/Microsoft.AspNet.FeatureModel/project.json b/src/Microsoft.AspNet.FeatureModel/project.json
@@ -1,5 +1,6 @@
 {
   "version": "1.0.0-*",
+  "description": "ASP.NET 5 HTTP feature infrastructure.",
   "dependencies": {
     "Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"
   },
diff --git a/src/Microsoft.AspNet.Http.Extensions/project.json b/src/Microsoft.AspNet.Http.Extensions/project.json
@@ -1,5 +1,6 @@
 {
     "version": "1.0.0-*",
+    "description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.",
     "dependencies": {
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.Framework.DependencyInjection": "1.0.0-*"
diff --git a/src/Microsoft.AspNet.Http/project.json b/src/Microsoft.AspNet.Http/project.json
@@ -1,5 +1,6 @@
 {
   "version": "1.0.0-*",
+  "description": "ASP.NET 5 HTTP object model. HttpContext and family.",
   "dependencies": {},
   "frameworks": {
     "aspnet50": {},
diff --git a/src/Microsoft.AspNet.HttpFeature/project.json b/src/Microsoft.AspNet.HttpFeature/project.json
@@ -1,5 +1,6 @@
 {
   "version": "1.0.0-*",
+  "description": "ASP.NET 5 HTTP feature interface definitions.",
   "frameworks": {
     "aspnet50": {},
     "aspnetcore50": {
diff --git a/src/Microsoft.AspNet.Owin/project.json b/src/Microsoft.AspNet.Owin/project.json
@@ -1,5 +1,6 @@
 {
     "version": "1.0.0-*",
+    "description": "ASP.NET 5 component for running OWIN middleware.",
     "dependencies": {
         "Microsoft.AspNet.Http": "1.0.0-*",
         "Microsoft.AspNet.FeatureModel": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.PipelineCore/project.json b/src/Microsoft.AspNet.PipelineCore/project.json
@@ -1,6 +1,7 @@
 
 {
   "version": "1.0.0-*",
+  "description": "ASP.NET 5 HTTP feature implementations.",
   "dependencies": {
     "Microsoft.AspNet.FeatureModel": "1.0.0-*",
     "Microsoft.AspNet.Http": "1.0.0-*",
diff --git a/src/Microsoft.AspNet.WebUtilities/project.json b/src/Microsoft.AspNet.WebUtilities/project.json
@@ -1,5 +1,6 @@
 {
     "version": "1.0.0-*",
+    "description": "ASP.NET 5 common helper methods such as URL encoding.",
     "dependencies": {
         "Microsoft.AspNet.Http": "1.0.0-*"
     },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 HTTP feature infrastructure.",`
`3`	`4`	`"dependencies": {`
`4`	`5`	`"Microsoft.Framework.Runtime.Interfaces": "1.0.0-*"`
`5`	`6`	`},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 common extension methods for HTTP abstractions and IApplicationBuilder.",`
`3`	`4`	`"dependencies": {`
`4`	`5`	`"Microsoft.AspNet.Http": "1.0.0-*",`
`5`	`6`	`"Microsoft.Framework.DependencyInjection": "1.0.0-*"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 HTTP object model. HttpContext and family.",`
`3`	`4`	`"dependencies": {},`
`4`	`5`	`"frameworks": {`
`5`	`6`	`"aspnet50": {},`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 component for running OWIN middleware.",`
`3`	`4`	`"dependencies": {`
`4`	`5`	`"Microsoft.AspNet.Http": "1.0.0-*",`
`5`	`6`	`"Microsoft.AspNet.FeatureModel": "1.0.0-*",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`
`2`	`2`	`{`
`3`	`3`	`"version": "1.0.0-*",`
	`4`	`+ "description": "ASP.NET 5 HTTP feature implementations.",`
`4`	`5`	`"dependencies": {`
`5`	`6`	`"Microsoft.AspNet.FeatureModel": "1.0.0-*",`
`6`	`7`	`"Microsoft.AspNet.Http": "1.0.0-*",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
	`3`	`+ "description": "ASP.NET 5 common helper methods such as URL encoding.",`
`3`	`4`	`"dependencies": {`
`4`	`5`	`"Microsoft.AspNet.Http": "1.0.0-*"`
`5`	`6`	`},`