fix: visionos overrides for build flags (#5967)

Author: NathanWalker

lib/services/ios-entitlements-service.ts

@@ -13,7 +13,7 @@ export class IOSEntitlementsService {
 		private $logger: ILogger,
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $mobileHelper: Mobile.IMobileHelper,
-		private $pluginsService: IPluginsService
+		private $pluginsService: IPluginsService,
 	) {}
 
 	public static readonly DefaultEntitlementsName: string = "app.entitlements";
@@ -23,28 +23,31 @@ export class IOSEntitlementsService {
 		const entitlementsPath = path.join(
 			projectData.appResourcesDirectoryPath,
 			this.$mobileHelper.normalizePlatformName(
-				this.$options.platformOverride ?? this.$devicePlatformsConstants.iOS
+				this.$options.platformOverride ?? this.$devicePlatformsConstants.iOS,
 			),
-			entitlementsName
+			entitlementsName,
 		);
 		return entitlementsPath;
 	}
 
 	public getPlatformsEntitlementsPath(projectData: IProjectData): string {
 		return path.join(
 			projectData.platformsDir,
-			this.$options.platformOverride ??
-				this.$devicePlatformsConstants.iOS.toLowerCase(),
+			this.$mobileHelper
+				.normalizePlatformName(
+					this.$options.platformOverride ?? this.$devicePlatformsConstants.iOS,
+				)
+				.toLowerCase(),
 			projectData.projectName,
-			projectData.projectName + ".entitlements"
+			projectData.projectName + ".entitlements",
 		);
 	}
 	public getPlatformsEntitlementsRelativePath(
-		projectData: IProjectData
+		projectData: IProjectData,
 	): string {
 		return path.join(
 			projectData.projectName,
-			projectData.projectName + ".entitlements"
+			projectData.projectName + ".entitlements",
 		);
 	}
 
@@ -71,7 +74,7 @@ export class IOSEntitlementsService {
 		for (const plugin of allPlugins) {
 			const pluginInfoPlistPath = path.join(
 				plugin.pluginPlatformsFolderPath(this.$devicePlatformsConstants.iOS),
-				IOSEntitlementsService.DefaultEntitlementsName
+				IOSEntitlementsService.DefaultEntitlementsName,
 			);
 			makePatch(pluginInfoPlistPath);
 		}
@@ -85,17 +88,17 @@ export class IOSEntitlementsService {
 			const plistContent = session.build();
 			this.$logger.trace(
 				"App.entitlements: Write to: " +
-					this.getPlatformsEntitlementsPath(projectData)
+					this.getPlatformsEntitlementsPath(projectData),
 			);
 			this.$fs.writeFile(
 				this.getPlatformsEntitlementsPath(projectData),
-				plistContent
+				plistContent,
 			);
 		}
 	}
 
 	private getAllInstalledPlugins(
-		projectData: IProjectData
+		projectData: IProjectData,
 	): Promise<IPluginData[]> {
 		return this.$pluginsService.getAllInstalledPlugins(projectData);
 	}

lib/services/ios-project-service.ts

@@ -130,6 +130,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 	}
 
 	private _platformsDirCache: string = null;
+	private _platformOverrideCache: string = null;
 	private _platformData: IPlatformData = null;
 
 	public getPlatformData(projectData: IProjectData): IPlatformData {
@@ -139,10 +140,12 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 			);
 		}
 
+		const currentOverride = this.$options.platformOverride ?? null;
 		if (
 			projectData &&
 			projectData.platformsDir &&
-			this._platformsDirCache !== projectData.platformsDir
+			(this._platformsDirCache !== projectData.platformsDir ||
+				this._platformOverrideCache !== currentOverride)
 		) {
 			const platform = this.$mobileHelper.normalizePlatformName(
 				this.$options.platformOverride ?? this.$devicePlatformsConstants.iOS,
@@ -231,6 +234,8 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 					".xbm",
 				], // https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIImage_Class/
 			};
+			this._platformsDirCache = projectData.platformsDir;
+			this._platformOverrideCache = currentOverride;
 		}
 
 		return this._platformData;
@@ -659,13 +664,10 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		projectData: IProjectData,
 		prepareData: IOSPrepareData,
 	): Promise<void> {
+		const platformData = this.getPlatformData(projectData);
 		const projectRoot = this.$options.hostProjectPath
 			? this.$options.hostProjectPath
-			: path.join(
-					projectData.platformsDir,
-					this.$devicePlatformsConstants.iOS.toLowerCase(),
-				);
-		const platformData = this.getPlatformData(projectData);
+			: platformData.projectRoot;
 
 		const pluginsData = this.getAllProductionPlugins(projectData);
 		const pbxProjPath = this.getPbxProjPath(projectData);