Merge branch 'release' into dev

2016-05-03 22:32:54 -07:00 · 2016-05-03 22:32:54 -07:00 · 557a14b17a
parent f3cc1f0e20 166e7c30e5
commit 557a14b17a
1 changed files with 2 additions and 1 deletions
--- a/test/ServerComparison.FunctionalTests/project.json
+++ b/test/ServerComparison.FunctionalTests/project.json
@ -15,7 +15,8 @@
    "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-*"
+    "Microsoft.Net.Http.Headers": "1.0.0-*",
+    "Microsoft.NETCore.Platforms": "1.0.1-*"
  },
  "publishOptions": {
    "include": [