Merge pull request #2356 from NativeScript/cankov/fix-signing

iOS signing fixes

Author: PanayotCankov

lib/services/ios-project-service.ts

@@ -997,11 +997,13 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 		return (() => {
 			// TRICKY: I am not sure why we totally disregard the buildConfig parameter here.
 			buildConfig = buildConfig || {};
+			let isXCConfigDefined = false;
 
 			if (this.$options.teamId) {
 				buildConfig.teamIdentifier = this.$options.teamId;
 			} else {
 				buildConfig = this.readXCConfigSigning();
+				isXCConfigDefined = true;
 				if (!buildConfig.codeSignIdentity && !buildConfig.mobileProvisionIdentifier && !buildConfig.teamIdentifier) {
 					buildConfig = this.readBuildConfigFromPlatforms();
 				}
@@ -1013,6 +1015,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 			} else if (buildConfig.teamIdentifier) {
 				signingStyle = "Automatic";
 			} else if (helpers.isInteractive()) {
+				isXCConfigDefined = false;
 				let signingStyles = [
 					"Manual - Select existing provisioning profile for use",
 					"Automatic - Select Team ID for signing and let Xcode select managed provisioning profile"
@@ -1038,7 +1041,7 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 				}
 			}
 
-			if (signingStyle) {
+			if (signingStyle && !isXCConfigDefined) {
 				const pbxprojPath = path.join(projectRoot, this.$projectData.projectName + ".xcodeproj", "project.pbxproj");
 				const xcode = Xcode.open(pbxprojPath);
 				switch(signingStyle) {
@@ -1052,6 +1055,11 @@ We will now place an empty obsolete compatability white screen LauncScreen.xib f
 				xcode.save();
 			}
 
+			if (isXCConfigDefined) {
+				delete buildConfig.mobileProvisionIdentifier;
+				delete buildConfig.teamIdentifier;
+			}
+
 			return buildConfig;
 		}).future<IiOSBuildConfig>()();
 	}

package.json

@@ -44,7 +44,7 @@
     "glob": "^7.0.3",
     "iconv-lite": "0.4.11",
     "inquirer": "0.9.0",
-    "ios-mobileprovision-finder": "1.0.8",
+    "ios-mobileprovision-finder": "1.0.9",
     "ios-sim-portable": "~1.6.0",
     "lockfile": "1.0.1",
     "lodash": "4.13.1",