From: chuckm911 <chuckm@microsoft.com>
Date: Thu, 24 Mar 2016 04:03:13 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into feature
X-Git-Tag: accepted/tizen/base/20180629.140029~5150^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a0b16e860bcc67f3494ec1c5db37402952761c4b;p=platform%2Fupstream%2Fcoreclr.git

Merge remote-tracking branch 'upstream/master' into feature
---

a0b16e860bcc67f3494ec1c5db37402952761c4b
diff --cc tests/src/JIT/config/benchmark/project.json
index 45f14df,2670341..ab33609
--- a/tests/src/JIT/config/benchmark/project.json
+++ b/tests/src/JIT/config/benchmark/project.json
@@@ -14,12 -14,8 +14,12 @@@
      "System.Threading": "4.0.10",
      "System.Threading.Tasks": "4.0.10",
      "System.Threading.Tasks.Parallel": "4.0.0",
 +    "System.Diagnostics.Process": "4.0.0",
 +    "System.Xml.XmlDocument": "4.0.0",
 +    "System.Xml.XPath": "4.0.0",
 +    "System.Xml.XPath.XmlDocument": "4.0.0",
      "xunit": "2.1.0",
-     "xunit.console.netcore": "1.0.2-prerelease-00128",
+     "xunit.console.netcore": "1.0.2-prerelease-00101",
      "xunit.runner.utility": "2.1.0"
    },
    "frameworks": {