Merge branch 'release' into dev

pakrym · pakrym · commit 8fe7a17dab3d · 2016-04-18T16:52:09.000-07:00
diff --git a/samples/SampleApp/project.json b/samples/SampleApp/project.json
@@ -1,8 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
-    "Microsoft.AspNetCore.Http": "1.0.0-*",
-    "Microsoft.NETCore.Platforms": "1.0.1-*"
+    "Microsoft.AspNetCore.Http": "1.0.0-*"
   },
   "commands": {
     "SampleApp": "SampleApp"
diff --git a/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json
@@ -4,6 +4,7 @@
     "keyFile": "../../tools/Key.snk"
   },
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Testing": "1.0.0-*",
     "xunit": "2.1.0"
diff --git a/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json b/test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
diff --git a/test/Microsoft.AspNetCore.Http.Features.Tests/project.json b/test/Microsoft.AspNetCore.Http.Features.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http.Features": "1.0.0-*",
     "xunit": "2.1.0"
   },
diff --git a/test/Microsoft.AspNetCore.Http.Tests/project.json b/test/Microsoft.AspNetCore.Http.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "xunit": "2.1.0"
   },
diff --git a/test/Microsoft.AspNetCore.Owin.Tests/project.json b/test/Microsoft.AspNetCore.Owin.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.Http": "1.0.0-*",
     "Microsoft.AspNetCore.Owin": "1.0.0-*",
     "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
diff --git a/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json b/test/Microsoft.AspNetCore.WebUtilities.Tests/project.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.AspNetCore.WebUtilities": "1.0.0-*",
     "xunit": "2.1.0"
   },
diff --git a/test/Microsoft.Net.Http.Headers.Tests/project.json b/test/Microsoft.Net.Http.Headers.Tests/project.json
@@ -1,6 +1,7 @@
 {
   "version": "1.0.0-*",
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
     "Microsoft.Net.Http.Headers": "1.0.0-*",
     "xunit": "2.1.0"
   },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"dependencies": {`
	`3`	`+ "Microsoft.NETCore.Platforms": "1.0.1-*",`
`3`	`4`	`"Microsoft.AspNetCore.Http": "1.0.0-*",`
`4`	`5`	`"Microsoft.AspNetCore.Http.Extensions": "1.0.0-*",`
`5`	`6`	`"Microsoft.Extensions.DependencyInjection": "1.0.0-*",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0.0-*",`
`3`	`3`	`"dependencies": {`
	`4`	`+ "Microsoft.NETCore.Platforms": "1.0.1-*",`
`4`	`5`	`"Microsoft.Net.Http.Headers": "1.0.0-*",`
`5`	`6`	`"xunit": "2.1.0"`
`6`	`7`	`},`