Merge remote-tracking branch 'origin/release' into HEAD

Author: IceBuildUser

lib/services/android-debug-service.ts

@@ -154,7 +154,7 @@ class AndroidDebugService implements IDebugService {
 
 	private attachDebugger(deviceId: string, packageName: string): IFuture<void> {
 		return (() => {
-			let startDebuggerCommand = ["am", "broadcast", "-a", '\"${packageName}-debug\"', "--ez", "enable", "true"];
+			let startDebuggerCommand = ["am", "broadcast", "-a", `\"${packageName}-debug\"`, "--ez", "enable", "true"];
 			this.device.adb.executeShellCommand(startDebuggerCommand).wait();
 
 			if (this.$options.client) {

lib/services/platform-service.ts

@@ -132,11 +132,7 @@ export class PlatformService implements IPlatformService {
 			platformData.platformProjectService.interpolateData().wait();
 			platformData.platformProjectService.afterCreateProject(platformData.projectRoot).wait();
 
-			if(this.$options.baseConfig) {
-				let newConfigFile = path.resolve(this.$options.baseConfig);
-				this.$logger.trace(`Replacing '${platformData.configurationFilePath}' with '${newConfigFile}'.`);
-				this.$fs.copyFile(newConfigFile, platformData.configurationFilePath).wait();
-			}
+			this.applyBaseConfigOption(platformData).wait();
 
 			let frameworkPackageNameData: any = {version: installedVersion};
 			if(customTemplateOptions) {
@@ -306,6 +302,8 @@ export class PlatformService implements IPlatformService {
 			// Replace placeholders in configuration files
 			platformData.platformProjectService.interpolateConfigurationFile().wait();
 
+			this.applyBaseConfigOption(platformData).wait();
+
 			this.$logger.out("Project successfully prepared");
 			return true;
 		}).future<boolean>()();
@@ -684,5 +682,15 @@ export class PlatformService implements IPlatformService {
 	private mapFrameworkFiles(npmCacheDirectoryPath: string, files: string[]): string[] {
 		return _.map(files, file => file.substr(npmCacheDirectoryPath.length + constants.PROJECT_FRAMEWORK_FOLDER_NAME.length + 1));
 	}
+
+	private applyBaseConfigOption(platformData: IPlatformData): IFuture<void> {
+		return (() => {
+			if(this.$options.baseConfig) {
+				let newConfigFile = path.resolve(this.$options.baseConfig);
+				this.$logger.trace(`Replacing '${platformData.configurationFilePath}' with '${newConfigFile}'.`);
+				this.$fs.copyFile(newConfigFile, platformData.configurationFilePath).wait();
+			}
+		}).future<void>()();
+	}
 }
 $injector.register("platformService", PlatformService);