summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Khanna <gkhanna@microsoft.com>2017-03-22 13:54:41 -0700
committerGitHub <noreply@github.com>2017-03-22 13:54:41 -0700
commitecf644fd125a7fd4699c346d44dff4edb9b578e1 (patch)
treec523b2dae933795fdf3ff0c014add7821517ac41
parentda1d8cd17a8ec2a78e8139d03be358d26acb503c (diff)
downloadcoreclr-ecf644fd125a7fd4699c346d44dff4edb9b578e1.tar.gz
coreclr-ecf644fd125a7fd4699c346d44dff4edb9b578e1.tar.bz2
coreclr-ecf644fd125a7fd4699c346d44dff4edb9b578e1.zip
Switch tests to use OSX.10.12 RID (#10394)
-rw-r--r--build-test.cmd2
-rw-r--r--config.json2
-rw-r--r--tests/src/Common/build_against_pkg_dependencies/project.json2
-rw-r--r--tests/src/Common/empty/project.json2
-rw-r--r--tests/src/Common/targeting_pack_ref/project.json2
-rw-r--r--tests/src/Common/test_dependencies/project.json2
-rw-r--r--tests/src/Common/test_runtime/project.json2
-rw-r--r--tests/src/TestWrappersConfig/project.json2
-rw-r--r--tests/src/dir.props2
9 files changed, 9 insertions, 9 deletions
diff --git a/build-test.cmd b/build-test.cmd
index 4744e491de..b8d68bea09 100644
--- a/build-test.cmd
+++ b/build-test.cmd
@@ -395,7 +395,7 @@ echo debian.8-x64: Builds overlay for Debian 8
echo fedora.23-x64: Builds overlay for Fedora 23
echo fedora.24-x64: Builds overlay for Fedora 23
echo opensuse.42.1-x64: Builds overlay for OpenSUSE 42.1
-echo osx.10.10-x64: Builds overlay for OSX 10.10
+echo osx.10.12-x64: Builds overlay for OSX 10.12
echo rhel.7-x64: Builds overlay for RHEL 7 or CentOS
echo ubuntu.14.04-x64: Builds overlay for Ubuntu 14.04
echo ubuntu.16.04-x64: Builds overlay for Ubuntu 16.04
diff --git a/config.json b/config.json
index 9900b47f2d..f0780ed111 100644
--- a/config.json
+++ b/config.json
@@ -327,7 +327,7 @@
"RuntimeId": {
"description": "Specifies the OS to build Core_Root for",
"valueType": "property",
- "values": [ "debian.8-x64", "fedora.23-x64", "opensuse.42.1-x64", "osx.10.10-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ],
+ "values": [ "debian.8-x64", "fedora.23-x64", "opensuse.42.1-x64", "osx.10.12-x64", "rhel.7-x64", "ubuntu.14.04-x64", "ubuntu.16.04-x64", "ubuntu.16.10-x64" ],
"defaultValue": "${__RuntimeId}"
},
"UpdateDependencies": {
diff --git a/tests/src/Common/build_against_pkg_dependencies/project.json b/tests/src/Common/build_against_pkg_dependencies/project.json
index cfd0750fca..313c895bfc 100644
--- a/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -21,7 +21,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json
index 82a0b7f3de..719c86df8a 100644
--- a/tests/src/Common/empty/project.json
+++ b/tests/src/Common/empty/project.json
@@ -10,7 +10,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/Common/targeting_pack_ref/project.json b/tests/src/Common/targeting_pack_ref/project.json
index ebd0c723a5..483c8759c1 100644
--- a/tests/src/Common/targeting_pack_ref/project.json
+++ b/tests/src/Common/targeting_pack_ref/project.json
@@ -16,7 +16,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
index a8dff1091e..13dc3bf691 100644
--- a/tests/src/Common/test_dependencies/project.json
+++ b/tests/src/Common/test_dependencies/project.json
@@ -20,7 +20,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index 3e8064972e..a1791c47da 100644
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -20,7 +20,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/TestWrappersConfig/project.json b/tests/src/TestWrappersConfig/project.json
index 5ea85787f3..fb2be0d5e2 100644
--- a/tests/src/TestWrappersConfig/project.json
+++ b/tests/src/TestWrappersConfig/project.json
@@ -23,7 +23,7 @@
"ubuntu.14.04-x64": {},
"ubuntu.16.04-x64": {},
"ubuntu.16.10-x64": {},
- "osx.10.10-x64": {},
+ "osx.10.12-x64": {},
"centos.7-x64": {},
"rhel.7-x64": {},
"debian.8-x64": {},
diff --git a/tests/src/dir.props b/tests/src/dir.props
index e0899ff202..cb976cc081 100644
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -47,7 +47,7 @@
<PropertyGroup>
<TargetsUnix>true</TargetsUnix>
<TargetsOSX>true</TargetsOSX>
- <TestNugetRuntimeId>osx.10.10-x64</TestNugetRuntimeId>
+ <TestNugetRuntimeId>osx.10.12-x64</TestNugetRuntimeId>
</PropertyGroup>
</When>
<When Condition="'$(OSGroup)'=='FreeBSD'">