From e1847d0b53ce0e0e0596b967917787a095cf6ca4 Mon Sep 17 00:00:00 2001
From: Jon Zgoda <jon@zgoda.us>
Date: Wed, 25 Sep 2019 14:55:27 -0500
Subject: [PATCH] fix(cli): add iCloudContainerEnvironment export option

---
 lib/services/ios/export-options-plist-service.ts  | 9 ++++++++-
 test/services/ios/export-options-plist-service.ts | 5 +++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lib/services/ios/export-options-plist-service.ts b/lib/services/ios/export-options-plist-service.ts
index d64a3dfe44..7302e50f0e 100644
--- a/lib/services/ios/export-options-plist-service.ts
+++ b/lib/services/ios/export-options-plist-service.ts
@@ -8,6 +8,7 @@ export class ExportOptionsPlistService implements IExportOptionsPlistService {
 	public createDevelopmentExportOptionsPlist(archivePath: string, projectData: IProjectData, buildConfig: IBuildConfig): IExportOptionsPlistOutput {
 		const exportOptionsMethod = this.getExportOptionsMethod(projectData, archivePath);
 		const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
+		const iCloudContainerEnvironment = buildConfig.iCloudContainerEnvironment;
 		let plistTemplate = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -25,7 +26,13 @@ export class ExportOptionsPlistService implements IExportOptionsPlistService {
     <key>uploadBitcode</key>
     <false/>
     <key>compileBitcode</key>
-    <false/>
+    <false/>`;
+		if (iCloudContainerEnvironment) {
+			plistTemplate += `
+    <key>iCloudContainerEnvironment</key>
+    <string>${iCloudContainerEnvironment}</string>`;
+		}
+		plistTemplate += `
 </dict>
 </plist>`;
 
diff --git a/test/services/ios/export-options-plist-service.ts b/test/services/ios/export-options-plist-service.ts
index e92c6e5a41..c6bd2cb96c 100644
--- a/test/services/ios/export-options-plist-service.ts
+++ b/test/services/ios/export-options-plist-service.ts
@@ -36,6 +36,11 @@ describe("ExportOptionsPlistService", () => {
 				name: "should create export options plist with mobileProvisionIdentifier",
 				buildConfig: { mobileProvisionIdentifier: "myTestProvision" },
 				expectedPlist: "<key>provisioningProfiles</key> <dict> 	<key>org.nativescript.myTestApp</key> 	<string>myTestProvision</string> </dict>"
+			},
+			{
+				name: "should create export options plist with Production iCloudContainerEnvironment",
+				buildConfig: { iCloudContainerEnvironment: "Production" },
+				expectedPlist: "<key>iCloudContainerEnvironment</key>     <string>Production</string>"
 			}
 		];