cleanup darwin product build

build/azure-pipelines/darwin/product-build-darwin.yml

@@ -45,15 +45,10 @@ steps:
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
 
-    cat << EOF |
-    $(macos-developer-certificate)
-    EOF
-    base64 -D > $(agent.tempdirectory)/cert.p12
-
-    # import the certificate to a newly created keychain
     security create-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
     security default-keychain -s $(agent.tempdirectory)/buildagent.keychain
     security unlock-keychain -p pwd $(agent.tempdirectory)/buildagent.keychain
+    echo "$(macos-developer-certificate)" | base64 -D > $(agent.tempdirectory)/cert.p12
     security import $(agent.tempdirectory)/cert.p12 -k $(agent.tempdirectory)/buildagent.keychain -P "$(macos-developer-certificate-key)" -T /usr/bin/codesign
     security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k pwd $(agent.tempdirectory)/buildagent.keychain
   displayName: Prepare tooling
@@ -139,20 +134,14 @@ steps:
 
 - script: |
     set -e
-    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist ../VSCode-darwin/*.app
+    codesign -s 99FM488X57 --deep --force --options runtime --entitlements build/azure-pipelines/darwin/entitlements.plist $(agent.builddirectory)/VSCode-darwin/*.app
   displayName: Set Hardened Entitlements
 
 - script: |
     set -e
-    pushd ../VSCode-darwin && zip -r -X -y ../VSCode-darwin.zip * && popd
+    pushd $(agent.builddirectory)/VSCode-darwin && zip -r -X -y $(agent.builddirectory)/VSCode-darwin.zip * && popd
   displayName: Archive build
 
-- task: PublishPipelineArtifact@0
-  displayName: 'Publish Pipeline Artifact'
-  inputs:
-    artifactName: darwin-unsigned
-    targetPath: ../VSCode-darwin.zip
-
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
     ConnectedServiceName: 'ESRP CodeSign'
@@ -178,14 +167,15 @@ steps:
   displayName: Codesign
 
 - script: |
-    zip -d ../VSCode-darwin.zip "*.pkg"
+    zip -d $(agent.builddirectory)/VSCode-darwin.zip "*.pkg"
   displayName: Clean Archive
 
-- task: PublishPipelineArtifact@0
-  displayName: 'Publish Pipeline Artifact'
-  inputs:
-    artifactName: darwin-signed
-    targetPath: ../VSCode-darwin.zip
+- script: |
+    APP_ROOT=$(agent.builddirectory)/VSCode-darwin
+    APP_NAME="`ls $APP_ROOT/*.app | head -n 1`"
+    BUNDLE_IDENTIFIER=$(node -p "require(\"$APP_ROOT/$APP_NAME/Contents/Resources/app/product.json\").darwinBundleIdentifier")
+    echo "##vso[task.setvariable variable=BundleIdentifier]$BUNDLE_IDENTIFIER"
+  displayName: Export bundle identifier
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs:
@@ -201,7 +191,7 @@ steps:
           "parameters": [
             {
               "parameterName": "BundleId",
-              "parameterValue": "com.microsoft.VSCodeInsiders"
+              "parameterValue": "$(BundleIdentifier)"
             }
           ],
           "toolName": "sign",
@@ -211,12 +201,6 @@ steps:
     SessionTimeout: 120
   displayName: Notarization
 
-- task: PublishPipelineArtifact@0
-  displayName: 'Publish Pipeline Artifact'
-  inputs:
-    artifactName: darwin-notarized
-    targetPath: ../VSCode-darwin.zip
-
 - script: |
     set -e
     VSCODE_MIXIN_PASSWORD="$(github-distro-mixin-password)" \