[cordova-windows] 02/02: CB-13870 workaround for visual studio <-> msbuild version mismatch with 2017(15.5) <-> 15

[janpio]

This is an automated email from the ASF dual-hosted git repository.

janpio pushed a commit to branch janpio-CB-13870
in repository https://gitbox.apache.org/repos/asf/cordova-windows.git

commit 51630fdd3b91b716508acc9b48f19b3924052006
Author: Jan Piotrowski <piotrow...@gmail.com>
AuthorDate: Mon Feb 12 16:26:27 2018 +0100

    CB-13870 workaround for visual studio <-> msbuild version mismatch with 
2017(15.5) <-> 15
---
 template/cordova/lib/MSBuildTools.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/cordova/lib/MSBuildTools.js 
b/template/cordova/lib/MSBuildTools.js
index 7710372..43fa670 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -82,7 +82,7 @@ module.exports.findAvailableVersion = function () {
 };
 
 function findAllAvailableVersionsFallBack () {
-    var versions = ['15.0', '14.0', '12.0', '4.0'];
+    var versions = ['15.5', '15.0', '14.0', '12.0', '4.0'];
     events.emit('verbose', 'Searching for available MSBuild versions...');
 
     return Q.all(versions.map(checkMSBuildVersion)).then(function 
(unprocessedResults) {
@@ -131,6 +131,7 @@ function checkMSBuildVersion (version) {
         return inst.version === version;
     })[0];
     if (correspondingWillow) {
+        if(version == '15.5') version = '15.0'; // workaround for vs<->msbuild 
version mismatch
         var toolsPath = path.join(correspondingWillow.path, 'MSBuild', 
version, 'Bin');
         if (shell.test('-e', toolsPath)) {
             return module.exports.getMSBuildToolsAt(toolsPath);

-- 
To stop receiving notification emails like this one, please contact
jan...@apache.org.

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org