Fixed build breaks

Commit migrated from https://github.com/dotnet/coreclr/commit/2149c6d519197ec5dc910782a0687e9495150d88

diff --git a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cs b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cs
index 70f78e0..8c87b75 100644 (file)
--- a/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cs
+++ b/src/coreclr/tests/src/JIT/Performance/RunBenchmarks/RunBenchmarks.cs
@@ -635,7 +635,7 @@ namespace BenchmarkConsoleApplication
 
             string[] path = directoryName.Split(DirectorySeparatorCharSet,
                     StringSplitOptions.RemoveEmptyEntries);
-            string platformSpecificDirectoryName = Path.Combine(path);
+            string platformSpecificDirectoryName = System.IO.Path.Combine(path);
 
             bool absolutePath = false;
             char firstChar = directoryName[0];
@@ -810,9 +810,9 @@ namespace BenchmarkConsoleApplication
             foreach (var benchmark in benchmarkList)
             {
                 string benchmarksRootDirectory = Controls.BenchmarksRootDirectory;
-                string benchmarkDirectory = Path.Combine(benchmarksRootDirectory, benchmark.WorkingDirectory);
+                string benchmarkDirectory = System.IO.Path.Combine(benchmarksRootDirectory, benchmark.WorkingDirectory);
                 string workingDirectory = benchmarkDirectory;
-                string executableName = Path.Combine(workingDirectory, benchmark.ExeName);
+                string executableName = System.IO.Path.Combine(workingDirectory, benchmark.ExeName);
 
                 Console.WriteLine("{0}", executableName);
             }
@@ -903,7 +903,7 @@ namespace BenchmarkConsoleApplication
             bool doVerbose = Controls.DoVerbose;
             string complusVersion = Controls.ComplusVersion;
             string benchmarksRootDirectory = Controls.BenchmarksRootDirectory;
-            string benchmarkDirectory = Path.Combine(benchmarksRootDirectory, benchmark.WorkingDirectory);
+            string benchmarkDirectory = System.IO.Path.Combine(benchmarksRootDirectory, benchmark.WorkingDirectory);
             bool doRunInShell = benchmark.DoRunInShell;
             bool useSSE = benchmark.UseSSE;
             bool useAVX = benchmark.UseAVX;
@@ -920,7 +920,7 @@ namespace BenchmarkConsoleApplication
             }
 
             string workingDirectory = benchmarkDirectory;
-            string fileName = Path.Combine(workingDirectory, benchmark.ExeName);
+            string fileName = System.IO.Path.Combine(workingDirectory, benchmark.ExeName);
             string args = benchmark.ExeArgs;
 
             if (runner != "")

diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json
index ab33609..7accba1 100644 (file)
--- a/src/coreclr/tests/src/JIT/config/benchmark/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json
@@ -14,7 +14,7 @@
     "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.Diagnostics.Process": "4.0.0-rc2-23816",
     "System.Xml.XmlDocument": "4.0.0",
     "System.Xml.XPath": "4.0.0",
     "System.Xml.XPath.XmlDocument": "4.0.0",