[TIMOB-24922] Fix cert generation on VS2017 (#71)

* [TIMOB-24922] Fix cert generation on VS2017 * [TIMOB-24922] Bump version to 0.5.1
appcelerator-archive · Jul 4, 2017 · 3cc8f1a · 3cc8f1a
1 parent 677b248
commit 3cc8f1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+0.5.1 (07/04/2017)
+-------------------
+  * [TIMOB-24922] Fix cert generation on VS2017 - Move to using vsDevCmd instead of vcvarsall
+  * [TIMOB-24668] Update VS2017 detection logic to prevent error with VS2015
 0.5.0 (05/9/2017)
 -------------------
   * Add emulator#status to get numeric status of emulator.

diff --git a/lib/certs.js b/lib/certs.js
@@ -89,7 +89,7 @@ function create(appid, certificateFile, options, callback) {
 				}
 
 				// first lets create the cert
-				appc.subprocess.run(vsInfo.vcvarsall.replace(/\ /g, '^ '), [
+				appc.subprocess.run(vsInfo.vsDevCmd.replace(/[ \(\)\&]/g, '^$&'), [
 					'&&',
 					options.powershell || 'powershell',
 					'-ExecutionPolicy', 'Bypass', '-NoLogo', '-NonInteractive', '-NoProfile',
@@ -221,7 +221,7 @@ function generate(subjectName, certificateFile, options, callback) {
 				'-e', expirationDate, '-sv', pvk, cer
 			];
 
-			appc.subprocess.run(vsInfo.vcvarsall.replace(/\ /g, '^ '), args, function (code, out, err) {
+			appc.subprocess.run(vsInfo.vsDevCmd.replace(/[ \(\)\&]/g, '^$&'), args, function (code, out, err) {
 				if (code) {
 					var ex = new Error(__('Failed to create certificate (code %s)', code));
 					emitter.emit('error', ex);
@@ -305,7 +305,7 @@ function generatePFX(privateKeyFile, certificateFile, pfxDestinationFile, passwo
 			}
 
 			// package the certificate as pfx
-			appc.subprocess.run(vsInfo.vcvarsall.replace(/\ /g, '^ '), args, function (code, out, err) {
+			appc.subprocess.run(vsInfo.vsDevCmd.replace(/[ \(\)\&]/g, '^$&'), args, function (code, out, err) {
 				if (code) {
 					var ex = new Error(__('Failed to convert certificate to pfx (code %s)', code));
 					emitter.emit('error', ex);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windowslib",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"description": "Windows Phone Utility Library",
 	"keywords": [
 		"appcelerator",