Remove Mac OS minor version number from package filtering.

Building on Mac OS 10.11 produces binaries that are compatible with
version 10.10.  It order to build packages on Macs running 10.11 I have
removed the OS minor version number as part of the package filtering.

Commit migrated from https://github.com/dotnet/corefx/commit/04b54e7ac019640a30272202aaaa210a02a29989

diff --git a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
index e984995..18d993d 100644 (file)
--- a/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.IO.Compression/runtime.native.System.IO.Compression.builds
@@ -24,7 +24,7 @@
       <Platform>amd64</Platform>
     </Project>
     <Project Include="osx\runtime.native.System.IO.Compression.pkgproj">
-      <OSGroup>osx.10.10</OSGroup>
+      <OSGroup>osx.10</OSGroup>
       <Platform>amd64</Platform>
     </Project>
     <Project Include="opensuse\13.2\runtime.native.System.IO.Compression.pkgproj">

diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
index 32933cb..3dbd0a2 100644 (file)
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Http/runtime.native.System.Net.Http.builds
@@ -24,7 +24,7 @@
       <Platform>amd64</Platform>
     </Project>
     <Project Include="osx\runtime.native.System.Net.Http.pkgproj">
-      <OSGroup>osx.10.10</OSGroup>
+      <OSGroup>osx.10</OSGroup>
       <Platform>amd64</Platform>
     </Project>
     <Project Include="opensuse\13.2\runtime.native.System.Net.Http.pkgproj">

diff --git a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
index d2ff9e1..48040c9 100644 (file)
--- a/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Net.Security/runtime.native.System.Net.Security.builds
@@ -24,7 +24,7 @@
       <Platform>amd64</Platform>
     </Project>
     <Project Include="osx\runtime.native.System.Net.Security.pkgproj">
-      <OSGroup>osx.10.10</OSGroup>
+      <OSGroup>osx.10</OSGroup>
       <Platform>amd64</Platform>
     </Project>
     <Project Include="opensuse\13.2\runtime.native.System.Net.Security.pkgproj">

diff --git a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
index 68176e4..06f09a9 100644 (file)
--- a/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
+++ b/src/libraries/Native/pkg/runtime.native.System.Security.Cryptography/runtime.native.System.Security.Cryptography.builds
@@ -24,7 +24,7 @@
       <Platform>amd64</Platform>
     </Project>
     <Project Include="osx\runtime.native.System.Security.Cryptography.pkgproj">
-      <OSGroup>osx.10.10</OSGroup>
+      <OSGroup>osx.10</OSGroup>
       <Platform>amd64</Platform>
     </Project>
     <Project Include="opensuse\13.2\runtime.native.System.Security.Cryptography.pkgproj">

diff --git a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
index 2b27e59..8d64949 100644 (file)
--- a/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
+++ b/src/libraries/Native/pkg/runtime.native.System/runtime.native.System.builds
@@ -24,7 +24,7 @@
       <Platform>amd64</Platform>
     </Project>
     <Project Include="osx\runtime.native.System.pkgproj">
-      <OSGroup>osx.10.10</OSGroup>
+      <OSGroup>osx.10</OSGroup>
       <Platform>amd64</Platform>
     </Project>
     <Project Include="opensuse\13.2\runtime.native.System.pkgproj">

diff --git a/src/libraries/build-packages.sh b/src/libraries/build-packages.sh
index cc8bd94..827c48a 100755 (executable)
--- a/src/libraries/build-packages.sh
+++ b/src/libraries/build-packages.sh
@@ -17,14 +17,14 @@ RuntimeOS=ubuntu.14.04
 OSName=$(uname -s)
 case $OSName in
     Darwin)
-        # Darwin version can be three sets of digits (e.g. 10.10.3), we want just the first two
-        DarwinVersion=$(sw_vers -productVersion | awk 'match($0, /[0-9]+\.[0-9]+/) { print substr($0, RSTART, RLENGTH) }')
+        # Darwin version can be three sets of digits (e.g. 10.10.3), we want just the first one
+        DarwinVersion=$(sw_vers -productVersion | awk 'match($0, /[0-9]+/) { print substr($0, RSTART, RLENGTH) }')
         RuntimeOS=osx.$DarwinVersion
         ;;
 
     FreeBSD|NetBSD)
         # TODO this doesn't seem correct
-        RuntimeOS=osx.10.10
+        RuntimeOS=osx.10
         ;;
 
     Linux)