projects / platform / upstream / coreclr.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cf3d02b cec26a6)
Merge remote-tracking branch 'upstream/master' into feature
authorchuckm911 <chuckm@microsoft.com>
Thu, 24 Mar 2016 04:03:13 +0000 (21:03 -0700)
committerchuckm911 <chuckm@microsoft.com>
Thu, 24 Mar 2016 04:03:13 +0000 (21:03 -0700)
1  2 
tests/src/JIT/config/benchmark/project.json patch | diff1 | diff2 | blob | history

diff --cc tests/src/JIT/config/benchmark/project.json
index 45f14df,2670341..ab33609
--- 1/tests/src/JIT/config/benchmark/project.json
--- 2/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": {
Domain: Dotnet / Core;