Distribution build for watch target fails

[siewedu]

Environment
Provide version numbers for the following components (information can be retrieved by running tns info in your project folder or by inspecting the package.json of the project):

• CLI: 6.4.1
• Cross-platform modules: 6.4.2
• iOS Runtime: 6.4.2

Describe the bug

I have added a watch project to my Nativescript project by following the instructions from here #4589 . I can successfully run tns prepare ios and the watch project is included in the xcode project afterwards.
I am using manual code signing to sign the iOS app as well as the watchOS app. Which both works perfectly fine as long as I do a development build.

But once I try to run the distribution build by providing the distribution profile via the --provision option I get the following error:

error: Provisioning profile "Generic Profile for Internal Deployment" doesn't include signing certificate "Apple Development: John Doe (XXXXX)". (in target 'watchapp Extension' from project '...')

So it looks like Provisioning Profile is updated but the wrong signing certificate is used. So looking into the autogenerated project.pbxproj reveals the following build setting for the watchapp and watchextension:
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";

This will apply the code settings only to iOS SDK targets. And hence the signing certificates for the watch project don't get updated. Changing the build setting for the watch targets to
"CODE_SIGN_IDENTITY" = "iPhone Distribution";
fixes the problem.

I assume the fix could be done simply by checking for the target in here:
pbxproj-dom

Unfortunately the code signing still fails for the distribution build after this fix. The --provision option makes sure that the correct provisioning profile is used when exporting the archive and building the ipa.
This is done by passing an exportOptions.plist file to xcodebuild.

This file is autogenerated by Nativescript during the tns build and it needs to state the correct provisioning profile for each target. But unfortunately the export-options-plist-service.ts provides only the profile for the iOS target. And therefore the archive export fails with the follwoing error:

Error Domain=IDEProvisioningErrorDomain Code=9 ""watchapp.app" requires a provisioning profile." UserInfo={IDEDistributionIssueSeverity=3, NSLocalizedDescription="watchapp.app" requires a provisioning profile., NSLocalizedRecoverySuggestion=Add a profile to the "provisioningProfiles" dictionary in your Export Options property list.}

Adding the following lines in export-options-plist-service.ts fixes the issue
<key>${projectData.projectIdentifiers.ios}.watchkitapp</key> <string>${provision}</string> <key>${projectData.projectIdentifiers.ios}.watchkitapp.watchkitextension</key> <string>${provision}</string>

To Reproduce
Run Nativescript project with watch extension and provide distribution profile via the --provision option

Expected behavior
ipa should be successfully created and signed