diff --git a/Tasks/Common/ios-signing-common/ios-signing-common.ts b/Tasks/Common/ios-signing-common/ios-signing-common.ts index bc92989d0408..5bf84d587bbb 100644 --- a/Tasks/Common/ios-signing-common/ios-signing-common.ts +++ b/Tasks/Common/ios-signing-common/ios-signing-common.ts @@ -27,9 +27,9 @@ export async function installCertInTemporaryKeychain(keychainPath: string, keych createKeychainCommand.arg(['create-keychain', '-p', keychainPwd, keychainPath]); await createKeychainCommand.exec(); - //update keychain settings + //update keychain settings, keep keychain unlocked for 6h = 21600 sec, which is the job timeout for paid hosted VMs let keychainSettingsCommand: ToolRunner = tl.tool(tl.which('security', true)); - keychainSettingsCommand.arg(['set-keychain-settings', '-lut', '7200', keychainPath]); + keychainSettingsCommand.arg(['set-keychain-settings', '-lut', '21600', keychainPath]); await keychainSettingsCommand.exec(); } diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts b/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts index 59abd09639a4..23534c40b1d2 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0CertificateValidForABriefTime.ts @@ -66,7 +66,7 @@ let a: ma.TaskLibAnswers = { "code": 0, "stdout": "keychain created" }, - "/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": { + "/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": { "code": 0, "stdout": "keychain settings" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts index 853c31c7096c..b266017c34b6 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallCertWithEmptyPassword.ts @@ -57,7 +57,7 @@ let a: ma.TaskLibAnswers = { "code": 0, "stdout": "keychain created" }, - "/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": { + "/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": { "code": 0, "stdout": "keychain settings" }, diff --git a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts index 38a9d871378f..101b65970e5c 100644 --- a/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts +++ b/Tasks/InstallAppleCertificateV2/Tests/L0InstallTempKeychain.ts @@ -57,7 +57,7 @@ let a: ma.TaskLibAnswers = { "code": 0, "stdout": "keychain created" }, - "/usr/bin/security set-keychain-settings -lut 7200 /build/temp/ios_signing_temp.keychain": { + "/usr/bin/security set-keychain-settings -lut 21600 /build/temp/ios_signing_temp.keychain": { "code": 0, "stdout": "keychain settings" }, diff --git a/Tasks/InstallAppleCertificateV2/package-lock.json b/Tasks/InstallAppleCertificateV2/package-lock.json index 2a5cd8df45c9..04caf53c5e2c 100644 --- a/Tasks/InstallAppleCertificateV2/package-lock.json +++ b/Tasks/InstallAppleCertificateV2/package-lock.json @@ -31,7 +31,7 @@ "ios-signing-common": { "version": "file:../../_build/Tasks/Common/ios-signing-common-1.0.0.tgz", "requires": { - "vsts-task-lib": "2.0.6" + "vsts-task-lib": "^2.0.3-preview" } }, "minimatch": { @@ -99,7 +99,7 @@ "integrity": "sha512-hFjPLMJkq02zF8U+LhZ4airH0ivaiKzGdlNAQlYFB3lWuGH/UANUrl63DVPUQOyGw+7ZNQ+ufM44T6mWN92xyg==", "requires": { "tunnel": "0.0.4", - "typed-rest-client": "0.12.0", + "typed-rest-client": "^0.12.0", "underscore": "1.8.3" } }, diff --git a/Tasks/InstallAppleCertificateV2/task.json b/Tasks/InstallAppleCertificateV2/task.json index 684f90f495f6..9eede396cefe 100644 --- a/Tasks/InstallAppleCertificateV2/task.json +++ b/Tasks/InstallAppleCertificateV2/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "releaseNotes": "Fixes codesign hangs on a self hosted agent. Keychain password is now required to use `Default Keychain` or `Custom Keychain`. Microsoft hosted builds should use `Temporary Keychain`.", diff --git a/Tasks/InstallAppleCertificateV2/task.loc.json b/Tasks/InstallAppleCertificateV2/task.loc.json index 363983cc026f..617c6b2ae732 100644 --- a/Tasks/InstallAppleCertificateV2/task.loc.json +++ b/Tasks/InstallAppleCertificateV2/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tasks/InstallAppleProvisioningProfileV1/task.json b/Tasks/InstallAppleProvisioningProfileV1/task.json index 5151016ff9ee..1a392411b07c 100644 --- a/Tasks/InstallAppleProvisioningProfileV1/task.json +++ b/Tasks/InstallAppleProvisioningProfileV1/task.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "runsOn": [ diff --git a/Tasks/InstallAppleProvisioningProfileV1/task.loc.json b/Tasks/InstallAppleProvisioningProfileV1/task.loc.json index 6f3faf542e7d..ebb63d61a69e 100644 --- a/Tasks/InstallAppleProvisioningProfileV1/task.loc.json +++ b/Tasks/InstallAppleProvisioningProfileV1/task.loc.json @@ -13,7 +13,7 @@ "author": "Microsoft Corporation", "version": { "Major": 1, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "runsOn": [ diff --git a/Tasks/XcodeV5/task.json b/Tasks/XcodeV5/task.json index ef34bc3bc3e9..edc780efaebc 100644 --- a/Tasks/XcodeV5/task.json +++ b/Tasks/XcodeV5/task.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "releaseNotes": "This version of the task is compatible with Xcode 8, Xcode 9 and Xcode 10. Features that were there solely to maintain compat with Xcode 7 have been removed. The task has better options to work with the Hosted macOS pool.", diff --git a/Tasks/XcodeV5/task.loc.json b/Tasks/XcodeV5/task.loc.json index df09f42bbc49..4990b9b55cfc 100644 --- a/Tasks/XcodeV5/task.loc.json +++ b/Tasks/XcodeV5/task.loc.json @@ -12,7 +12,7 @@ "author": "Microsoft Corporation", "version": { "Major": 5, - "Minor": 149, + "Minor": 150, "Patch": 0 }, "releaseNotes": "ms-resource:loc.releaseNotes", diff --git a/Tests-Legacy/L0/XcodeV5/responseSigningFile.json b/Tests-Legacy/L0/XcodeV5/responseSigningFile.json index 121a044f0f87..c10e0482970a 100644 --- a/Tests-Legacy/L0/XcodeV5/responseSigningFile.json +++ b/Tests-Legacy/L0/XcodeV5/responseSigningFile.json @@ -47,7 +47,7 @@ "code": 0, "stdout": "temporary keychain created" }, - "/usr/bin/security set-keychain-settings -lut 7200 /user/build/_xcodetasktmp.keychain": { + "/usr/bin/security set-keychain-settings -lut 21600 /user/build/_xcodetasktmp.keychain": { "code": 0, "stdout": "set-keychain-settings on temporary keychain output" },