diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-project-service.ts index 692ce7b46c..5a8390e2fa 100644 --- a/lib/services/ios-project-service.ts +++ b/lib/services/ios-project-service.ts @@ -419,7 +419,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ public ensureConfigurationFileInAppResources(): IFuture { return (() => { let projectDir = this.$projectData.projectDir; - let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName); + let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName); if (!this.$fs.exists(infoPlistPath).wait()) { // The project is missing Info.plist, try to populate it from the project template. @@ -444,7 +444,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ private mergeInfoPlists(): IFuture { return (() => { let projectDir = this.$projectData.projectDir; - let infoPlistPath = path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName); + let infoPlistPath = this.$options.baseConfig || path.join(projectDir, constants.APP_FOLDER_NAME, constants.APP_RESOURCES_FOLDER_NAME, this.platformData.normalizedPlatformName, this.platformData.configurationFileName); this.ensureConfigurationFileInAppResources().wait(); if (!this.$fs.exists(infoPlistPath).wait()) { diff --git a/lib/services/platform-service.ts b/lib/services/platform-service.ts index 327e66bc0f..12357fe7f9 100644 --- a/lib/services/platform-service.ts +++ b/lib/services/platform-service.ts @@ -301,11 +301,11 @@ export class PlatformService implements IPlatformService { let excludedDirs = [constants.APP_RESOURCES_FOLDER_NAME]; this.$projectFilesManager.processPlatformSpecificFiles(directoryPath, platform, excludedDirs).wait(); + this.applyBaseConfigOption(platformData).wait(); + // Process configurations files from App_Resources platformData.platformProjectService.processConfigurationFilesFromAppResources().wait(); - this.applyBaseConfigOption(platformData).wait(); - // Replace placeholders in configuration files platformData.platformProjectService.interpolateConfigurationFile().wait();