From a26d40d466148a3b2ab8d26b24a38b645997d474 Mon Sep 17 00:00:00 2001
From: Aditya Patwardhan <adityap@microsoft.com>
Date: Wed, 15 Mar 2023 15:03:00 -0700
Subject: [PATCH] Fix issues in release build and release pipeline

---
 tools/releaseBuild/azureDevOps/releaseBuild.yml    | 8 ++++++++
 tools/releaseBuild/azureDevOps/releasePipeline.yml | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index b670d55de74..dfde466a80b 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -322,6 +322,14 @@ stages:
     jobs:
     - template: templates/windows-package-signing.yml
 
+    - template: templates/mac-package-signing.yml
+        parameters:
+          buildArchitecture: x64
+
+    - template: templates/mac-package-signing.yml
+        parameters:
+          buildArchitecture: arm64
+
   # This is done late so that we dont use resources before the big signing and packaging tasks.
   - stage: compliance
     dependsOn: ['package_signing']
diff --git a/tools/releaseBuild/azureDevOps/releasePipeline.yml b/tools/releaseBuild/azureDevOps/releasePipeline.yml
index bd52a99b844..7e474c3acb6 100644
--- a/tools/releaseBuild/azureDevOps/releasePipeline.yml
+++ b/tools/releaseBuild/azureDevOps/releasePipeline.yml
@@ -175,6 +175,7 @@ stages:
   jobs:
   - job: KickOffRA
     displayName: Kickoff Release Automation
+    timeoutInMinutes: 240
 
     pool:
       name: PowerShell1ES
@@ -257,7 +258,6 @@ stages:
   - StaticPkgValidation
   - StartDocker
   - ManualValidation
-  - ReleaseAutomation
   - ValidateFxdPackage
   - ValidateGlobalTool
 
@@ -557,7 +557,7 @@ stages:
         $isPreview = $semanticVersion.PreReleaseLabel -ne $null
 
         if (-not $isPreview) {
-          $buildInvocationInfo = Start-AzDOBuild -BuildDefinitionId 1238 -Tag $metadata.ReleaseVersion, 'InProgress' -PassThru
+          $buildInvocationInfo = Start-AzDOBuild -BuildDefinitionId 1238  -Branch '$(Build.SourceBranch)' -Tag $metadata.ReleaseVersion, 'InProgress' -PassThru
           Write-Verbose -Verbose "Kicked off vPack build: $($buildInvocationInfo.WebUrl)"
           $status = $buildInvocationInfo | Wait-AzDOBuildStatus -Status Completed -timeoutMinutes 60
           if ($status.result -ne 'Succeeded') {