SHA updated

Author: Vladimir Enchev

lib/common

@@ -268,11 +268,8 @@ export class PlatformService implements IPlatformService {
 				sourceFiles = sourceFiles.filter(source => !minimatch(source, `**/${constants.TNS_MODULES_FOLDER_NAME}/**`, { nocase: true }));
 			}
 
-			// Verify .xml files are well-formed. If not valid stop the transfer.
-			if(!this.$xmlValidator.validateXmlFiles(sourceFiles).wait()){
-				this.$errors.failWithoutHelp("Invalid or not well-formed XML files detected!");
-				return false;
-			}
+			// Verify .xml files are well-formed.
+			this.$xmlValidator.validateXmlFiles(sourceFiles).wait();
 
 			// Remove .ts and .js.map files
 			constants.LIVESYNC_EXCLUDED_FILE_PATTERNS.forEach(pattern => sourceFiles = sourceFiles.filter(file => !minimatch(file, pattern, { nocase: true })));

lib/services/platform-service.ts

@@ -82,6 +82,7 @@ function createTestInjector(projectPath: string, projectName: string): IInjector
 	testInjector.register("xcprojService", {});
 	testInjector.register("pluginVariablesService", PluginVariablesService);
 	testInjector.register("pluginVariablesHelper", PluginVariablesHelper);
+	testInjector.register("androidProcessService", {});
 	return testInjector;
 }
 

test/ios-project-service.ts

@@ -336,16 +336,16 @@ describe('Platform Service Tests', () => {
 
 			platformService = testInjector.resolve("platformService");
 			let oldLoggerWarner = testInjector.resolve("$logger").warn;
-			let warnings: string = "";
-			try {
-				testInjector.resolve("$logger").warn = (text: string) => warnings += text;
-				platformService.preparePlatform("android").wait();
-			} finally {
-				testInjector.resolve("$logger").warn = oldLoggerWarner;
-			}
-
-			// Asserts that prepare has caught invalid xml
-			assert.isFalse(warnings.indexOf("has errors") !== -1);
+ 			let warnings: string = "";
+ 			try {
+ 				testInjector.resolve("$logger").warn = (text: string) => warnings += text;
+ 				platformService.preparePlatform("android").wait();
+ 			} finally {
+ 				testInjector.resolve("$logger").warn = oldLoggerWarner;
+ 			}
+ 
+ 			// Asserts that prepare has caught invalid xml
+ 			assert.isFalse(warnings.indexOf("has errors") !== -1);
 		});
 	});
 });