Merge pull request #6399 from cb1kenobi/timob-18088_3_5_X

[TIMOB-18088] Updated to ioslib 0.2.11 which includes support for iOS de...

iphone/cli/commands/_build.js

@@ -2829,12 +2829,28 @@ iOSBuilder.prototype.invokeXcodeBuild = function invokeXcodeBuild(next) {
 		xcodeArgs.push('CODE_SIGN_ENTITLEMENTS=Entitlements.plist');
 	}
 
+	var keychains = this.iosInfo.certs.keychains;
+
 	if (this.target === 'device') {
-		xcodeArgs.push('CODE_SIGN_IDENTITY=iPhone Developer: ' + this.certDeveloperName);
+		Object.keys(keychains).some(function (keychain) {
+			return (keychains[keychain].developer || []).some(function (d) {
+				if (!d.invalid && d.name === this.certDeveloperName) {
+					xcodeArgs.push('CODE_SIGN_IDENTITY=' + d.fullname);
+					return true;
+				}
+			}, this);
+		}, this);
 	}
 
 	if (/dist-appstore|dist\-adhoc/.test(this.target)) {
-		xcodeArgs.push('CODE_SIGN_IDENTITY=iPhone Distribution: ' + this.certDistributionName);
+		Object.keys(keychains).some(function (keychain) {
+			return (keychains[keychain].developer || []).some(function (d) {
+				if (!d.invalid && d.name === this.certDistributionName) {
+					xcodeArgs.push('CODE_SIGN_IDENTITY=' + d.fullname);
+					return true;
+				}
+			}, this);
+		}, this);
 	}
 
 	var xcodebuildHook = this.cli.createHook('build.ios.xcodebuild', this, function (exe, args, opts, done) {