From 2d5c0b720cf0c7244996512dabcb504acdbaa221 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Tue, 16 Jul 2024 10:38:52 -0700
Subject: [PATCH] Upgrade the dotnet core version installed for the esrp
 signing task (#104980)

Co-authored-by: Jeremy Koritzinsky <jekoritz@microsoft.com>
---
 .../common/macos-sign-with-entitlements.yml      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/eng/pipelines/common/macos-sign-with-entitlements.yml b/eng/pipelines/common/macos-sign-with-entitlements.yml
index 3c2bfed29efb2..2c3c4caf3c723 100644
--- a/eng/pipelines/common/macos-sign-with-entitlements.yml
+++ b/eng/pipelines/common/macos-sign-with-entitlements.yml
@@ -1,12 +1,14 @@
 parameters:
   filesToSign: []
+  timeoutInMinutes: '30'
 
 steps:
   - task: UseDotNet@2
-    displayName: 'Use .NET Core SDK 2.1.808'
+    displayName: Install .NET 6 SDK for signing.
     inputs:
-      packageType: sdk
-      version: 2.1.808
+      packageType: 'sdk'
+      version: '6.0.x'
+      installationPath: '$(Agent.TempDirectory)/dotnet'
 
   - ${{ each file in parameters.filesToSign }}:
     - script: codesign -s - -f --entitlements ${{ file.entitlementsFile }} ${{ file.path }}/${{ file.name }}
@@ -53,6 +55,14 @@ steps:
             "toolVersion": "1.0"
           }
         ]  
+      SessionTimeout: ${{ parameters.timeoutInMinutes }}
+      MaxConcurrency: '50'
+      MaxRetryAttempts: '5'
+      PendingAnalysisWaitTimeoutMinutes: '5'
+    env:
+      DOTNET_MULTILEVEL_LOOKUP: 0
+      DOTNET_ROOT: '$(Agent.TempDirectory)/dotnet'
+      DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR: '$(Agent.TempDirectory)/dotnet'
 
   - task: ExtractFiles@1
     displayName: 'Extract MacOS after signing'