[cordova-windows] 10/11: Visual Studio 15.5 is a thing the script should know about

[janpio]

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

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

commit eaa1a346b2f2b79a04e6d1812dd9ab4c13524702
Author: Jan Piotrowski <piotrow...@gmail.com>
AuthorDate: Wed Feb 14 20:01:03 2018 +0100

    Visual Studio 15.5 is a thing the script should know about
---
 template/cordova/lib/MSBuildTools.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/template/cordova/lib/MSBuildTools.js 
b/template/cordova/lib/MSBuildTools.js
index 43fcb6d..3cacc3b 100644
--- a/template/cordova/lib/MSBuildTools.js
+++ b/template/cordova/lib/MSBuildTools.js
@@ -75,12 +75,12 @@ MSBuildTools.prototype.buildProject = function (projFile, 
buildType, buildarch,
 // returns full path to msbuild tools required to build the project and tools 
version
 // check_reqs.js -> run()
 module.exports.findAvailableVersion = function () {
-    var versions = ['15.0', '14.0', '12.0', '4.0'];
+    var versions = ['15.5', '15.0', '14.0', '12.0', '4.0'];
 
     return Q.all(versions.map(checkMSBuildVersion)).then(function (versions) {
         console.log('findAvailableVersion', versions);
         // select first msbuild version available, and resolve promise with it
-        var msbuildTools = versions[0] || versions[1] || versions[2] || 
versions[3];
+        var msbuildTools = versions[0] || versions[1] || versions[2] || 
versions[3] || versions[4];
 
         return msbuildTools ? Q.resolve(msbuildTools) : Q.reject('MSBuild 
tools not found');
     });
@@ -106,9 +106,9 @@ module.exports.findAllAvailableVersions = function () {
 };
 
 function findAllAvailableVersionsFallBack () {
-    var versions = ['15.0', '14.0', '12.0', '4.0'];
     console.log('findAllAvailableVersionsFALLBACK');
 
+    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) {

-- 
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