From e3d5b23ff96a3742dd8f5592c956c3c1d454c57e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Alexander=20K=C3=B6plinger?= <alex.koeplinger@outlook.com>
Date: Fri, 12 Jul 2019 19:46:50 +0200
Subject: [PATCH] [ci] Upload mac-entitlements.plist to azure when uploading
 .pkg

So it can be used by the codesigning job.
---
 mono/mini/{mac-entitlements.xml => mac-entitlements.plist} | 0
 scripts/ci/pipeline/osx-package.groovy                     | 5 ++++-
 scripts/ci/run-jenkins.sh                                  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)
 rename mono/mini/{mac-entitlements.xml => mac-entitlements.plist} (100%)

diff --git a/mono/mini/mac-entitlements.xml b/mono/mini/mac-entitlements.plist
similarity index 100%
rename from mono/mini/mac-entitlements.xml
rename to mono/mini/mac-entitlements.plist
diff --git a/scripts/ci/pipeline/osx-package.groovy b/scripts/ci/pipeline/osx-package.groovy
index 76d593e5373..f01d7635709 100644
--- a/scripts/ci/pipeline/osx-package.groovy
+++ b/scripts/ci/pipeline/osx-package.groovy
@@ -45,13 +45,16 @@ node (isPr ? "mono-package-pr" : "mono-package") {
                     // move .pkg to the workspace root
                     sh 'mv packaging/MacSDKRelease/MonoFramework-MDK-*.pkg .'
                     packageFileName = findFiles (glob: "MonoFramework-MDK-*.pkg")[0].name
+
+                    // move mac-entitlements.plist to the workspace root
+                    sh 'mv mono/mini/mac-entitlements.plist .'
                 }
                 stage('Upload .pkg to Azure') {
                     azureUpload(storageCredentialId: (isPrivate ? "bc6a99d18d7d9ca3f6bf6b19e364d564" : "fbd29020e8166fbede5518e038544343"),
                                 storageType: "blobstorage",
                                 containerName: "${jobName}",
                                 virtualPath: "${monoBranch}/${env.BUILD_NUMBER}/${commitHash}/",
-                                filesPath: "${packageFileName}",
+                                filesPath: "${packageFileName},mac-entitlements.plist",
                                 allowAnonymousAccess: (isPrivate ? false : true),
                                 pubAccessible: (isPrivate ? false : true),
                                 doNotWaitForPreviousBuild: true,
diff --git a/scripts/ci/run-jenkins.sh b/scripts/ci/run-jenkins.sh
index 3e4f6df4e4c..5c16d7ffaaf 100755
--- a/scripts/ci/run-jenkins.sh
+++ b/scripts/ci/run-jenkins.sh
@@ -360,7 +360,7 @@ fi
 if [[ ${CI_TAGS} == *'checked-coop'* ]]; then export MONO_CHECK_MODE=gc,thread; fi
 if [[ ${CI_TAGS} == *'checked-all'* ]]; then export MONO_CHECK_MODE=all; fi
 
-if [[ ${CI_TAGS} == *'hardened-runtime'* ]]; then codesign -s - -fv -o runtime --entitlements ${MONO_REPO_ROOT}/mono/mini/mac-entitlements.xml ${MONO_REPO_ROOT}/mono/mini/mono-sgen; fi
+if [[ ${CI_TAGS} == *'hardened-runtime'* ]]; then codesign -s - -fv -o runtime --entitlements ${MONO_REPO_ROOT}/mono/mini/mac-entitlements.plist ${MONO_REPO_ROOT}/mono/mini/mono-sgen; fi
 
 export MONO_ENV_OPTIONS="$MONO_ENV_OPTIONS $MONO_TEST_ENV_OPTIONS"
 
-- 
2.11.4.GIT