From 7096c1fbebd4c10860c957ac20c4b209cf805bbb Mon Sep 17 00:00:00 2001
From: Joao Moreno <joao.moreno@microsoft.com>
Date: Fri, 29 Nov 2019 08:56:01 +0100
Subject: [PATCH] notarize app

---
 .../darwin/product-build-darwin.yml           | 27 +++++++++++++++++--
 build/azure-pipelines/product-build.yml       |  1 +
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 273a728927f..b59933f5afb 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -141,14 +141,37 @@ steps:
         {
           "keyCode": "CP-401337-Apple",
           "operationSetCode": "MacAppDeveloperSign",
-          "parameters": [ ],
+          "parameters": {
+            "Hardening": "--options=runtime"
+          },
           "toolName": "sign",
           "toolVersion": "1.0"
         }
       ]
-    SessionTimeout: 120
+    SessionTimeout: 60
   displayName: Codesign
 
+- task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
+  inputs:
+    ConnectedServiceName: 'ESRP CodeSign'
+    FolderPath: '$(agent.builddirectory)'
+    Pattern: 'VSCode-darwin.zip'
+    signConfigType: inlineSignParams
+    inlineOperation: |
+      [
+        {
+          "keyCode": "CP-401337-Apple",
+          "operationSetCode": " MacAppNotarize",
+          "parameters": {
+            "BundleId": "com.microsoft.VSCodeInsiders"
+          },
+          "toolName": "sign",
+          "toolVersion": "1.0"
+        }
+      ]
+    SessionTimeout: 120
+  displayName: Notarization
+
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \
diff --git a/build/azure-pipelines/product-build.yml b/build/azure-pipelines/product-build.yml
index ecf47fa1cdd..aefcd66f2e8 100644
--- a/build/azure-pipelines/product-build.yml
+++ b/build/azure-pipelines/product-build.yml
@@ -101,6 +101,7 @@ jobs:
 
 - job: macOS
   condition: and(succeeded(), eq(variables['VSCODE_COMPILE_ONLY'], 'false'), eq(variables['VSCODE_BUILD_MACOS'], 'true'))
+  timeoutInMinutes: 180
   pool:
     vmImage: macOS 10.13
   dependsOn:
-- 
GitLab