Imported Upstream version 1.0.0.9910upstream/1.0.0.9910

7 files changed, 110 insertions, 142 deletions

diff --git a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
index dbdfc0ef94..ddb905087b 100644
--- a/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
+++ b/tests/src/Common/Coreclr.TestWrapper/CoreclrTestWrapperLib.cs
@@ -35,6 +35,10 @@ namespace CoreclrTestLib
 
             string gcstressVar = Environment.GetEnvironmentVariable(GC_STRESS_LEVEL);
 
+            // Check if we are running in Windows
+            string operatingSystem = System.Environment.GetEnvironmentVariable("OS");
+            bool runningInWindows = (operatingSystem != null && operatingSystem.StartsWith("Windows"));
+
             var outputStream = new FileStream(outputFile, FileMode.Create);
             var errorStream = new FileStream(errorFile, FileMode.Create);
 
@@ -49,7 +53,18 @@ namespace CoreclrTestLib
                     process.StartInfo.EnvironmentVariables["COMPlus_GCStress"] = gcstressVar;
                 }
 
-                process.StartInfo.FileName = executable;
+                // Windows can run the executable implicitly
+                if (runningInWindows)
+                {
+                    process.StartInfo.FileName = executable;
+                }
+                // Non-windows needs to be told explicitly to run through /bin/bash shell
+                else
+                {
+                    process.StartInfo.FileName = "/bin/bash";
+                    process.StartInfo.Arguments = executable;
+                }
+
                 process.StartInfo.UseShellExecute = false;
                 process.StartInfo.RedirectStandardOutput = true;
                 process.StartInfo.RedirectStandardError = true;
diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json
index 562485594f..719be5949c 100644
--- a/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.ILAsm": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.ILDAsm": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.Jit": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.TestHost": "1.2.0-beta-24820-02"
+    "Microsoft.NETCore.ILAsm": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.ILDAsm": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.Jit": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.TestHost": "2.0.0-beta-25007-01"
   },
   "frameworks": {
     "netcoreapp1.1": {
diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json
index 1954111901..cc74ba8472 100644
--- a/tests/src/Common/empty/project.json
+++ b/tests/src/Common/empty/project.json
@@ -8,9 +8,13 @@
     "win7-x86": {},
     "win7-x64": {},
     "ubuntu.14.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "ubuntu.16.10-x64": {},
     "osx.10.10-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
-    "debian.8-x64": {}
+    "debian.8-x64": {},
+    "fedora.23-x64": {},
+    "opensuse.13.2-x64": {}
   }
 }
diff --git a/tests/src/Common/netcoreapp/project.json b/tests/src/Common/netcoreapp/project.json
index 51193fc015..ab1528282e 100644
--- a/tests/src/Common/netcoreapp/project.json
+++ b/tests/src/Common/netcoreapp/project.json
@@ -1,74 +1,9 @@
 {
-  "version": "1.0.0-*",
-  "buildOptions": {
-    "debugType": "portable",
-    "emitEntryPoint": true
-  },
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.Targets": "1.2.0-beta-24820-02",
-    "System.Threading.Thread": "4.4.0-beta-24820-02",
-    "System.Collections": "4.4.0-beta-24820-02",
-    "System.Xml.XmlSerializer": "4.4.0-beta-24820-02",
-    "System.Collections.Concurrent": "4.4.0-beta-24820-02",
-    "System.ObjectModel": "4.4.0-beta-24820-02",
-    "System.Runtime.Numerics": "4.4.0-beta-24820-02",
-    "System.Collections.NonGeneric": "4.4.0-beta-24820-02",
-    "System.Collections.Specialized": "4.4.0-beta-24820-02",
-    "System.ComponentModel": "4.4.0-beta-24820-02",
-    "System.Reflection.Emit.Lightweight": "4.4.0-beta-24820-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24820-02",
-    "System.Console": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Contracts": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Debug": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Process": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Tools": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Tracing": "4.4.0-beta-24820-02",
-    "System.Dynamic.Runtime": "4.4.0-beta-24820-02",
-    "System.Globalization": "4.4.0-beta-24820-02",
-    "System.Globalization.Calendars": "4.4.0-beta-24820-02",
-    "System.IO": "4.4.0-beta-24820-02",
-    "System.IO.FileSystem": "4.4.0-beta-24820-02",
-    "System.IO.FileSystem.Primitives": "4.4.0-beta-24820-02",
-    "System.Linq": "4.4.0-beta-24820-02",
-    "System.Linq.Queryable": "4.4.0-beta-24820-02",
-    "System.Linq.Expressions": "4.4.0-beta-24820-02",
-    "System.Reflection": "4.4.0-beta-24820-02",
-    "System.Reflection.Extensions": "4.4.0-beta-24820-02",
-    "System.Resources.ResourceManager": "4.4.0-beta-24820-02",
-    "System.Runtime": "4.4.0-beta-24820-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24820-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24820-02",
-    "System.Runtime.Handles": "4.4.0-beta-24820-02",
-    "System.Runtime.InteropServices": "4.4.0-beta-24820-02",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24820-02",
-    "System.Runtime.Loader": "4.4.0-beta-24820-02",
-    "System.Security.Cryptography.Algorithms": "4.4.0-beta-24820-02",
-    "System.Text.Encoding": "4.4.0-beta-24820-02",
-    "System.Text.Encoding.Extensions": "4.4.0-beta-24820-02",
-    "System.Text.RegularExpressions": "4.4.0-beta-24820-02",
-    "System.Threading": "4.4.0-beta-24820-02",
-    "System.Threading.AccessControl": "4.4.0-beta-24820-02",
-    "System.Threading.Overlapped": "4.4.0-beta-24820-02",
-    "System.Threading.Tasks": "4.4.0-beta-24820-02",
-    "System.Threading.Tasks.Parallel": "4.4.0-beta-24820-02",
-    "System.Threading.ThreadPool": "4.4.0-beta-24820-02",
-    "System.Threading.Timer": "4.4.0-beta-24820-02",
-    "System.Xml.ReaderWriter": "4.4.0-beta-24820-02",
-    "System.Xml.XDocument": "4.4.0-beta-24820-02",
-    "System.Xml.XmlDocument": "4.4.0-beta-24820-02",
-    "System.Xml.XPath": "4.4.0-beta-24820-02",
-    "System.Xml.XPath.XmlDocument": "4.4.0-beta-24820-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24820-02"
+    "Microsoft.NETCore.App": "2.0.0-beta-001494-00",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02"
   },
   "frameworks": {
-    "netcoreapp1.1": {
-      "dependencies": {
-        "Microsoft.NETCore.Runtime.CoreCLR": "1.2.0-beta-24820-02"
-      }
-    }
-  },
-  "runtimes": {
-    "win7-x64": {}
+    "netcoreapp2.0": { }
   }
 }
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index c1f033b946..1743f6fc8a 100644
--- a/tests/src/Common/targeting_pack_ref/project.json
+++ b/tests/src/Common/targeting_pack_ref/project.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Microsoft.TargetingPack.Private.CoreCLR": "1.2.0-beta-24820-02"
+    "Microsoft.TargetingPack.Private.CoreCLR": "2.0.0-beta-25007-01"
   },
   "frameworks": {
     "netcoreapp1.1": {
@@ -14,9 +14,13 @@
     "win7-x86": {},
     "win7-x64": {},
     "ubuntu.14.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "ubuntu.16.10-x64": {},
     "osx.10.10-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
-    "debian.8-x64": {}
+    "debian.8-x64": {},
+    "fedora.23-x64": {},
+    "opensuse.13.2-x64": {}
   }
 }
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index 5f059148b8..771391a989 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -7,67 +7,68 @@
     "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0040",
     "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0040",
-    "Microsoft.Win32.Primitives": "4.4.0-beta-24820-02",
+    "Microsoft.Win32.Primitives": "4.4.0-beta-24913-02",
     "Newtonsoft.Json": "8.0.3",
-    "Microsoft.NETCore.Platforms": "1.2.0-beta-24820-02",
-    "Microsoft.NETCore.Targets": "1.2.0-beta-24820-02",
-    "System.Collections.Immutable": "1.4.0-beta-24820-02",
-    "System.Threading.Thread": "4.4.0-beta-24820-02",
-    "System.Collections": "4.4.0-beta-24820-02",
-    "System.Xml.XmlSerializer": "4.4.0-beta-24820-02",
-    "System.Collections.Concurrent": "4.4.0-beta-24820-02",
-    "System.ObjectModel": "4.4.0-beta-24820-02",
-    "System.Runtime.Numerics": "4.4.0-beta-24820-02",
-    "System.Collections.NonGeneric": "4.4.0-beta-24820-02",
-    "System.Collections.Specialized": "4.4.0-beta-24820-02",
-    "System.ComponentModel": "4.4.0-beta-24820-02",
-    "System.Reflection.Emit.Lightweight": "4.4.0-beta-24820-02",
-    "System.Reflection.TypeExtensions": "4.4.0-beta-24820-02",
-    "System.Console": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Contracts": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Debug": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Process": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Tools": "4.4.0-beta-24820-02",
-    "System.Diagnostics.Tracing": "4.4.0-beta-24820-02",
-    "System.Dynamic.Runtime": "4.4.0-beta-24820-02",
-    "System.Globalization": "4.4.0-beta-24820-02",
-    "System.Globalization.Calendars": "4.4.0-beta-24820-02",
-    "System.IO": "4.4.0-beta-24820-02",
-    "System.IO.FileSystem": "4.4.0-beta-24820-02",
-    "System.IO.FileSystem.Primitives": "4.4.0-beta-24820-02",
-    "System.Linq": "4.4.0-beta-24820-02",
-    "System.Linq.Queryable": "4.4.0-beta-24820-02",
-    "System.Linq.Expressions": "4.4.0-beta-24820-02",
-    "System.Reflection": "4.4.0-beta-24820-02",
-    "System.Reflection.Extensions": "4.4.0-beta-24820-02",
-    "System.Resources.ResourceManager": "4.4.0-beta-24820-02",
-    "System.Runtime": "4.4.0-beta-24820-02",
-    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24820-02",
-    "System.Runtime.Extensions": "4.4.0-beta-24820-02",
-    "System.Runtime.Handles": "4.4.0-beta-24820-02",
-    "System.Runtime.InteropServices": "4.4.0-beta-24820-02",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24820-02",
-    "System.Runtime.Loader": "4.4.0-beta-24820-02",
-    "System.Runtime.Serialization.Json": "4.4.0-beta-24820-02",
-    "System.Runtime.Serialization.Primitives": "4.4.0-beta-24820-02",
-    "System.Runtime.Serialization.Xml": "4.4.0-beta-24820-02",
-    "System.Security.Cryptography.Algorithms": "4.4.0-beta-24820-02",
-    "System.Text.Encoding": "4.4.0-beta-24820-02",
-    "System.Text.Encoding.Extensions": "4.4.0-beta-24820-02",
-    "System.Text.RegularExpressions": "4.4.0-beta-24820-02",
-    "System.Threading": "4.4.0-beta-24820-02",
-    "System.Threading.AccessControl": "4.4.0-beta-24820-02",
-    "System.Threading.Overlapped": "4.4.0-beta-24820-02",
-    "System.Threading.Tasks": "4.4.0-beta-24820-02",
-    "System.Threading.Tasks.Parallel": "4.4.0-beta-24820-02",
-    "System.Threading.ThreadPool": "4.4.0-beta-24820-02",
-    "System.Threading.Timer": "4.4.0-beta-24820-02",
-    "System.Xml.ReaderWriter": "4.4.0-beta-24820-02",
-    "System.Xml.XDocument": "4.4.0-beta-24820-02",
-    "System.Xml.XmlDocument": "4.4.0-beta-24820-02",
-    "System.Xml.XPath": "4.4.0-beta-24820-02",
-    "System.Xml.XPath.XmlDocument": "4.4.0-beta-24820-02",
-    "System.Numerics.Vectors": "4.4.0-beta-24820-02"
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
+    "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
+    "System.Collections.Immutable": "1.4.0-beta-24913-02",
+    "System.Threading.Thread": "4.4.0-beta-24913-02",
+    "System.Collections": "4.4.0-beta-24913-02",
+    "System.Xml.XmlSerializer": "4.4.0-beta-24913-02",
+    "System.Collections.Concurrent": "4.4.0-beta-24913-02",
+    "System.ObjectModel": "4.4.0-beta-24913-02",
+    "System.Runtime.Numerics": "4.4.0-beta-24913-02",
+    "System.Collections.NonGeneric": "4.4.0-beta-24913-02",
+    "System.Collections.Specialized": "4.4.0-beta-24913-02",
+    "System.ComponentModel": "4.4.0-beta-24913-02",
+    "System.Reflection.Emit.Lightweight": "4.4.0-beta-24913-02",
+    "System.Reflection.TypeExtensions": "4.4.0-beta-24913-02",
+    "System.Console": "4.4.0-beta-24913-02",
+    "System.Diagnostics.Contracts": "4.4.0-beta-24913-02",
+    "System.Diagnostics.Debug": "4.4.0-beta-24913-02",
+    "System.Diagnostics.Process": "4.4.0-beta-24913-02",
+    "System.Diagnostics.Tools": "4.4.0-beta-24913-02",
+    "System.Diagnostics.Tracing": "4.4.0-beta-24913-02",
+    "System.Dynamic.Runtime": "4.4.0-beta-24913-02",
+    "System.Globalization": "4.4.0-beta-24913-02",
+    "System.Globalization.Calendars": "4.4.0-beta-24913-02",
+    "System.IO": "4.4.0-beta-24913-02",
+    "System.IO.FileSystem": "4.4.0-beta-24913-02",
+    "System.IO.FileSystem.Primitives": "4.4.0-beta-24913-02",
+    "System.Linq": "4.4.0-beta-24913-02",
+    "System.Linq.Queryable": "4.4.0-beta-24913-02",
+    "System.Linq.Expressions": "4.4.0-beta-24913-02",
+    "System.Memory": "4.4.0-beta-24913-02",
+    "System.Reflection": "4.4.0-beta-24913-02",
+    "System.Reflection.Extensions": "4.4.0-beta-24913-02",
+    "System.Resources.ResourceManager": "4.4.0-beta-24913-02",
+    "System.Runtime": "4.4.0-beta-24913-02",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-24913-02",
+    "System.Runtime.Extensions": "4.4.0-beta-24913-02",
+    "System.Runtime.Handles": "4.4.0-beta-24913-02",
+    "System.Runtime.InteropServices": "4.4.0-beta-24913-02",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.4.0-beta-24913-02",
+    "System.Runtime.Loader": "4.4.0-beta-24913-02",
+    "System.Runtime.Serialization.Json": "4.4.0-beta-24913-02",
+    "System.Runtime.Serialization.Primitives": "4.4.0-beta-24913-02",
+    "System.Runtime.Serialization.Xml": "4.4.0-beta-24913-02",
+    "System.Security.Cryptography.Algorithms": "4.4.0-beta-24913-02",
+    "System.Text.Encoding": "4.4.0-beta-24913-02",
+    "System.Text.Encoding.Extensions": "4.4.0-beta-24913-02",
+    "System.Text.RegularExpressions": "4.4.0-beta-24913-02",
+    "System.Threading": "4.4.0-beta-24913-02",
+    "System.Threading.AccessControl": "4.4.0-beta-24913-02",
+    "System.Threading.Overlapped": "4.4.0-beta-24913-02",
+    "System.Threading.Tasks": "4.4.0-beta-24913-02",
+    "System.Threading.Tasks.Parallel": "4.4.0-beta-24913-02",
+    "System.Threading.ThreadPool": "4.4.0-beta-24913-02",
+    "System.Threading.Timer": "4.4.0-beta-24913-02",
+    "System.Xml.ReaderWriter": "4.4.0-beta-24913-02",
+    "System.Xml.XDocument": "4.4.0-beta-24913-02",
+    "System.Xml.XmlDocument": "4.4.0-beta-24913-02",
+    "System.Xml.XPath": "4.4.0-beta-24913-02",
+    "System.Xml.XPath.XmlDocument": "4.4.0-beta-24913-02",
+    "System.Numerics.Vectors": "4.4.0-beta-24913-02"
   },
   "frameworks": {
     "netcoreapp1.1": {
@@ -81,9 +82,13 @@
     "win7-x86": {},
     "win7-x64": {},
     "ubuntu.14.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "ubuntu.16.10-x64": {},
     "osx.10.10-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
-    "debian.8-x64": {}
+    "debian.8-x64": {},
+    "fedora.23-x64": {},
+    "opensuse.13.2-x64": {}
   }
 }
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index 2c7c15f414..ef47999b2c 100644
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -1,14 +1,15 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Platforms": "2.0.0-beta-25007-01",
     "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
-    "jit-dasm": "0.0.1.1",
+    "jit-dasm": "0.0.1.4",
     "cijobs": "0.0.1.2",
-    "jit-analyze": "0.0.1.0"
+    "jit-analyze": "0.0.1.1"
   },
   "frameworks": {
     "netcoreapp1.1": {
       "imports": [
-        "dnxcore50",  
+        "dnxcore50",
         "portable-net45+win8"
       ]
     }
@@ -17,9 +18,13 @@
     "win7-x86": {},
     "win7-x64": {},
     "ubuntu.14.04-x64": {},
+    "ubuntu.16.04-x64": {},
+    "ubuntu.16.10-x64": {},
     "osx.10.10-x64": {},
     "centos.7-x64": {},
     "rhel.7-x64": {},
-    "debian.8-x64": {}
+    "debian.8-x64": {},
+    "fedora.23-x64": {},
+    "opensuse.13.2-x64": {}
   }
 }