diff options
| -rw-r--r-- | BuildToolsVersion.txt | 2 | ||||
| -rw-r--r-- | tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs | 7 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark+roslyn/project.json | 1 | ||||
| -rw-r--r-- | tests/src/JIT/config/benchmark+serialize/project.json | 1 |
4 files changed, 10 insertions, 1 deletions
diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt index 562e0b4ba9..1b8f50277a 100644 --- a/BuildToolsVersion.txt +++ b/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.25-prerelease-00301-03
\ No newline at end of file +1.0.25-prerelease-00307-04
\ No newline at end of file diff --git a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs index e0b9e9987a..92e132a327 100644 --- a/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs +++ b/tests/src/JIT/Performance/CodeQuality/Roslyn/CscBench.cs @@ -32,6 +32,13 @@ public static class CscBench { string CoreRoot = System.Environment.GetEnvironmentVariable("CORE_ROOT"); if (CoreRoot == null) { return false; } + // Some CoreCLR packages have mscorlib.ni.dll only + string nicorlib = Path.Combine(CoreRoot, "mscorlib.ni.dll"); + if(File.Exists(nicorlib)) + { + MscorlibPath = nicorlib; + return true; + } MscorlibPath = Path.Combine(CoreRoot, "mscorlib.dll"); return File.Exists(MscorlibPath); } diff --git a/tests/src/JIT/config/benchmark+roslyn/project.json b/tests/src/JIT/config/benchmark+roslyn/project.json index b50748292f..c15abb6771 100644 --- a/tests/src/JIT/config/benchmark+roslyn/project.json +++ b/tests/src/JIT/config/benchmark+roslyn/project.json @@ -6,6 +6,7 @@ "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0029", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23816", "System.Console": "4.0.0-rc2-23816", + "System.Dynamic.Runtime": "4.0.0.0", "System.Numerics.Vectors": "4.1.1-rc2-23816", "System.Reflection": "4.0.10", "System.Reflection.Extensions": "4.0.0", diff --git a/tests/src/JIT/config/benchmark+serialize/project.json b/tests/src/JIT/config/benchmark+serialize/project.json index 2b6148d68a..675fa29bbf 100644 --- a/tests/src/JIT/config/benchmark+serialize/project.json +++ b/tests/src/JIT/config/benchmark+serialize/project.json @@ -8,6 +8,7 @@ "System.Console": "4.0.0-rc2-23816", "System.IO": "4.0.10", "System.ObjectModel": "4.0.10", + "System.Dynamic.Runtime": "4.0.0.0", "System.Runtime": "4.1.0-rc2-23816", "System.Runtime.Serialization.Json": "4.0.0", "System.Runtime.Serialization.Primitives": "4.0.10", |