chore: Fixed merge conflicts.

Author: cb1kenobi

packages/plugin-titanium/src/cli/info/windows.js

@@ -3,8 +3,19 @@ export default {
 	render(console, info) {
 		const { bold, cyan, gray, magenta } = require('chalk');
 
-		console.log('Windows');
-		console.log(info);
+		console.log(bold('Microsoft® Visual Studio'));
+
+		if (info.visualstudio && Object.keys(info.visualstudio).length) {
+			for (const ver of Object.keys(info.visualstudio).sort()) {
+				const vs = info.visualstudio[ver];
+				console.log(`  ${cyan(ver)}${vs.selected ? gray(' (selected)') : ''}`);
+				console.log(`    Path                = ${magenta(vs.path)}`);
+				console.log(`    CLR Version         = ${magenta(vs.clrVersion)}`);
+				console.log(`    MSBuild Version     = ${magenta(`v${vs.msbuildVersion}`)}`);
+			}
+		} else {
+			console.log(gray('  None'));
+		}
 		console.log();
 	}
 };

packages/plugin-windows/CHANGELOG.md

@@ -1,5 +1,7 @@
-# v1.5.0
+# v2.0.0
 
+ * BREAKING CHANGE: Removed all Windows Phone related code.
+ * fix: Updated config to remove redundant `windows` namespace.
  * chore: Update dependencies.
 
 # v1.4.0 (Jun 6, 2019)

packages/plugin-windows/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcd/plugin-windows",
-  "version": "1.4.0",
+  "version": "2.0.0",
   "description": "Windows service for the Appc Daemon.",
   "main": "./dist/index",
   "author": "Appcelerator, Inc. <[email protected]>",

packages/plugin-windows/src/windows-info-service.js

@@ -18,28 +18,16 @@ export default class WindowsInfoService extends DataServiceDispatcher {
 	 */
 	async activate(cfg) {
 		this.data = gawk({
-			devices: [],
-			emulators: {},
 			windows: {},
 			visualstudio: {},
-			windowsphone: {},
 			selectedVisualStudio: {}
 		});
 
 		this.timers = {};
 
 		// wire up Visual Studio detection first so that we can use its result to know if we should query the other thing
 		await this.wireupDetection('visualstudio', get(cfg, 'windows.visualstudio.pollInterval') || 60000 * 10, () => this.detectVisualStudios());
-
-		await Promise.all([
-			this.wireupDetection('emulators',      get(cfg, 'windows.emulators.pollInterval')    || 60000 * 5,  () => this.detectEmulators()),
-			this.wireupDetection('windows',        get(cfg, 'windows.windowsSDK.pollInterval')   || 60000 / 2,  () => this.detectWindowsSDKs()),
-			this.wireupDetection('windowsphone',   get(cfg, 'windows.windowsPhone.pollInterval') || 60000 / 2,  () => this.detectWindowsPhone())
-		]);
-
-		// wire up devices after the rest to avoid DAEMON-173 where emulator and
-		// device detect functions attempt to build and write wptool at the same time
-		await this.wireupDetection('devices',      get(cfg, 'windows.device.pollInterval')       || 2500,       () => this.detectDevices());
+		await this.wireupDetection('windows',      get(cfg, 'windows.windowsSDK.pollInterval')   || 60000 / 2,  () => this.detectWindowsSDKs());
 	}
 
 	/**