Merge remote-tracking branch 'hartwig-cordova/feature/appdeploy-wpsdk8.1'
diff --git a/template/cordova/lib/utils.js b/template/cordova/lib/utils.js
index 28fb018..f3efd7e 100644
--- a/template/cordova/lib/utils.js
+++ b/template/cordova/lib/utils.js
@@ -23,8 +23,16 @@
proc = require('child_process'),
msbuildTools = require('./MSBuildTools');
-// returns path to XapDeploy util from Windows Phone 8.1 SDK
+// returns path to app deployment util from Windows Phone 8.x SDK
module.exports.getXapDeploy = function () {
+ // Try the newer AppDeploy first
+ var appDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
+ 'Microsoft SDKs', 'Windows Phone', 'v8.1', 'Tools', 'AppDeploy', 'AppDeployCmd.exe');
+ if (fs.existsSync(appDeployUtils)) {
+ return Q.resolve(appDeployUtils);
+ }
+
+ // If AppDeployCmd wasn't found, try XapDeployCmd
var xapDeployUtils = path.join((process.env["ProgramFiles(x86)"] || process.env["ProgramFiles"]),
'Microsoft SDKs', 'Windows Phone', 'v8.0', 'Tools', 'Xap Deployment', 'XapDeployCmd.exe');
// Check if XapDeployCmd is exists
