refactor(windows): Work on windowslib refactor.

package.json

@@ -7,7 +7,8 @@
   },
   "scripts": {
     "build": "lerna exec gulp build",
-    "link": "lerna exec yarn link"
+    "link": "lerna exec yarn link",
+    "unlink": "lerna exec yarn unlink"
   },
   "workspaces": {
     "packages": [

packages/plugin-windows/CHANGELOG.md

@@ -1,6 +1,8 @@
 # v2.0.0
 
  * BREAKING CHANGE: Removed all Windows Phone related code.
+ * BREAKING CHANGE: Renamed `windows` to `sdks` and `visualstudio` to `vs`in info results.
+ * BREAKING CHANGE: Removed `selectedVisualStudio` from info results.
  * fix: Updated config to remove redundant `windows` namespace.
  * chore: Update dependencies.
 

packages/plugin-windows/conf/config.js

@@ -1,41 +1,25 @@
 module.exports = {
-	device: {
+	sdk: {
 		/**
-		 * The number of milliseconds to rescan for connected devices.
-		 * @type {Number}
+		 * A list of paths to search for Windows SDKs.
+		 * @type {Array.<String>}
 		 */
-		pollInterval: null
+		searchPaths: null
 	},
 
-	emulators: {
+	vs: {
 		/**
-		 * The number of milliseconds to rescan for emulators.
-		 * @type {Number}
+		 * A list of paths to search for Visual Studio installations.
+		 * @type {Array.<String>}
 		 */
-		pollInterval: null
+		searchPaths: null
 	},
 
-	visualstudio: {
+	vswhere: {
 		/**
-		 * The number of milliseconds to rescan for Visual Studio installations.
-		 * @type {Number}
+		 * A list of paths to search for the `vswhere.exe` utility.
+		 * @type {Array.<String>}
 		 */
-		pollInterval: null
-	},
-
-	windowsPhone: {
-		/**
-		 * The number of milliseconds to rescan for Windows Phone SDKs.
-		 * @type {Number}
-		 */
-		pollInterval: null
-	},
-
-	windowsSDK: {
-		/**
-		 * The number of milliseconds to rescan for Windows SDKs.
-		 * @type {Number}
-		 */
-		pollInterval: null
+		searchPaths: null
 	}
 };

packages/plugin-windows/src/version.js

@@ -0,0 +1,77 @@
+import semver from 'semver';
+
+function format(ver, min, max, chopDash) {
+	ver = ('' + (ver || 0));
+	if (chopDash) {
+		ver = ver.replace(/(-.*)?$/, '');
+	}
+	ver = ver.split('.');
+	if (min !== undefined) {
+		while (ver.length < min) {
+			ver.push('0');
+		}
+	}
+	if (max !== undefined) {
+		ver = ver.slice(0, max);
+	}
+	return ver.join('.');
+}
+
+function eq(v1, v2) {
+	return semver.eq(format(v1, 3, 3), format(v2, 3, 3));
+}
+
+function gte(v1, v2) {
+	return semver.gte(format(v1, 3, 3), format(v2, 3, 3));
+}
+
+function gt(v1, v2) {
+	return semver.gt(format(v1, 3, 3), format(v2, 3, 3));
+}
+
+function lte(v1, v2) {
+	return semver.lte(format(v1, 3, 3), format(v2, 3, 3));
+}
+
+function lt(v1, v2) {
+	return semver.lt(format(v1, 3, 3), format(v2, 3, 3));
+}
+
+function compare(v1, v2) {
+	return eq(v1, v2) ? 0 : lt(v1, v2) ? -1 : 1;
+}
+
+function rcompare(v1, v2) {
+	return eq(v1, v2) ? 0 : lt(v1, v2) ? 1 : -1;
+}
+
+function satisfies(ver, str) {
+	ver = format(ver, 3, 3, true);
+	str = str.replace(/(<=?\d+(\.\d+)*?)\.x/g, '$1.99999999').replace(/(>=?\d+(\.\d+)*?)\.x/g, '$1.0');
+	try {
+		if (str === '*' || eq(ver, str)) {
+			return true;
+		}
+	} catch (ex) {
+		// squelch
+	}
+
+	return str.split(/\s*\|\|\s*/).some(function (range) {
+		// semver is picky with the '-' in comparisons and it just so happens when it
+		// parses versions in the range, it will add '-0' and cause '1.0.0' != '1.0.0-0',
+		// so we test our version with and without the '-9'
+		return range === '*' || semver.satisfies(ver, range) || (ver.indexOf('-') === -1 && semver.satisfies(ver + '-0', range));
+	});
+}
+
+export default {
+	format,
+	eq,
+	gte,
+	gt,
+	lte,
+	lt,
+	compare,
+	rcompare,
+	satisfies
+};