From 637b442e5636df806550be589ccdc3cf95223ece Mon Sep 17 00:00:00 2001 From: Gaurav Khanna Date: Wed, 22 Mar 2017 08:55:53 -0700 Subject: [PATCH] Move OSX packages to use 10.12 as the RID (dotnet/coreclr#10354) Commit migrated from https://github.com/dotnet/coreclr/commit/66384321b7fb53a57163e3d895407800a37ca44e --- docs/coreclr/workflow/OfficalAndDailyBuilds.md | 2 +- src/coreclr/src/.nuget/dir.props | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/coreclr/workflow/OfficalAndDailyBuilds.md b/docs/coreclr/workflow/OfficalAndDailyBuilds.md index 2b83b44..3b5d3b9 100644 --- a/docs/coreclr/workflow/OfficalAndDailyBuilds.md +++ b/docs/coreclr/workflow/OfficalAndDailyBuilds.md @@ -70,7 +70,7 @@ something affecting all builds). |**FreeBSD 10.1**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_freebsd.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_freebsd)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_freebsd.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_freebsd)| |**openSUSE 13.2**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_opensuse13.2.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_opensuse13.2)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_opensuse13.2.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_opensuse13.2)| |**openSUSE 42.1**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_opensuse42.1.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_opensuse42.1)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_opensuse42.1.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_opensuse42.1)| -|**OS X 10.11**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_osx.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_osx)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_osx.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_osx)| +|**OS X 10.12**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_osx.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_osx)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_osx.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_osx)| |**Red Hat 7.2**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_rhel7.2.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_rhel7.2)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_rhel7.2.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_rhel7.2)| |**Fedora 23**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_fedora23.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_fedora23)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_fedora23.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_fedora23)| |**Ubuntu 14.04**|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/debug_ubuntu.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/debug_ubuntu)|[![x64 status](https://img.shields.io/jenkins/s/https/ci.dot.net/job/dotnet_coreclr/job/master/release_ubuntu.svg?label=x64)](http://ci.dot.net/job/dotnet_coreclr/job/master/job/release_ubuntu)| diff --git a/src/coreclr/src/.nuget/dir.props b/src/coreclr/src/.nuget/dir.props index de85ad6..eb14571 100644 --- a/src/coreclr/src/.nuget/dir.props +++ b/src/coreclr/src/.nuget/dir.props @@ -11,7 +11,7 @@ <_parseDistroRid>$(__DistroRid) - <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.10-x64 + <_parseDistroRid Condition="'$(_parseDistroRid)' == '' and '$(__BuildOS)' == 'OSX'">osx.10.12-x64 <_distroRidIndex>$(_parseDistroRid.IndexOfAny("-")) <_archRidIndex>$([MSBuild]::Add($(_distroRidIndex), 1)) $(_parseDistroRid.SubString(0, $(_distroRidIndex))) @@ -68,7 +68,7 @@ - osx.10.10-$(ArchGroup) + osx.10.12-$(ArchGroup) @@ -125,7 +125,7 @@ - + -- 2.7.4