From 49691464ba628c666ae3bb6a59d4e997fe366641 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Tue, 7 Aug 2018 23:54:52 +0000
Subject: [PATCH] Merged PR 4405: Fix MacOS build

---
 tools/packaging/packaging.psm1                     | 2 ++
 tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1
index 0eeed1c27a..3ad65a0e33 100644
--- a/tools/packaging/packaging.psm1
+++ b/tools/packaging/packaging.psm1
@@ -60,6 +60,8 @@ function Start-PSPackage {
             $WindowsRuntime, "Release"
         } elseif ($Type -eq "tar-arm") {
             New-PSOptions -Configuration "Release" -Runtime "Linux-ARM" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
+        } elseif ($Type -eq "osxpkg") {
+            New-PSOptions -Configuration "Release" -Runtime 'osx.10.12-x64' -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         } else {
             New-PSOptions -Configuration "Release" -WarningAction SilentlyContinue | ForEach-Object { $_.Runtime, $_.Configuration }
         }
diff --git a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1 b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
index 43acf60461..cda565a558 100644
--- a/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
+++ b/tools/releaseBuild/macOS/PowerShellPackageVsts.ps1
@@ -71,9 +71,9 @@ try {
     }
 
     if ($Build.IsPresent) {
-        Start-PSBuild -Crossgen -PSModuleRestore @releaseTagParam
+        Start-PSBuild -Crossgen -PSModuleRestore @releaseTagParam -Runtime osx.10.12-x64
 
-        Start-PSPackage @releaseTagParam
+        Start-PSPackage @releaseTagParam -Type 'osxpkg'
         switch ($ExtraPackage) {
             "tar" { Start-PSPackage -Type tar @releaseTagParam }
         }