Merge branch 'release' into dev

2016-04-18 16:36:58 -07:00 · 2016-04-18 16:36:58 -07:00 · bc066851ee
parent 5983909c0c f94faf4276
commit bc066851ee
2 changed files with 2 additions and 0 deletions
--- a/test/Microsoft.AspNetCore.Html.Abstractions.Test/project.json
+++ b/test/Microsoft.AspNetCore.Html.Abstractions.Test/project.json
@ -4,6 +4,7 @@
    "keyFile": "../../tools/Key.snk"
  },
  "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
    "Microsoft.AspNetCore.Html.Abstractions": "1.0.0-*",
    "Microsoft.AspNetCore.Testing": "1.0.0-*",
    "Microsoft.Extensions.WebEncoders": "1.0.0-*",
--- a/test/Microsoft.Extensions.WebEncoders.Tests/project.json
+++ b/test/Microsoft.Extensions.WebEncoders.Tests/project.json
@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
    "Microsoft.Extensions.DependencyInjection": "1.0.0-*",
    "Microsoft.Extensions.WebEncoders": "1.0.0-*",
    "xunit": "2.1.0"