@react-native-windows/cli 0.0.0-canary.21 → 0.0.0-canary.211

package/lib-commonjs/{runWindows/utils → utils}/version.js

@@ -1,110 +1,110 @@
-"use strict";
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- * @format
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-const VERSION_EXPRESSION = /^\d{1,8}(\.\d{1,8}){0,3}$/;
-class Version {
-    constructor(major, minor = 0, build = 0, qfe = 0) {
-        this.major = major;
-        this.minor = minor;
-        this.build = build;
-        this.qfe = qfe;
-    }
-    eq(other) {
-        if (other.constructor !== Version) {
-            throw new TypeError('other must be a Version instance');
-        }
-        return (this.major === other.major &&
-            this.minor === other.minor &&
-            this.build === other.build &&
-            this.qfe === other.qfe);
-    }
-    gt(other) {
-        if (other.constructor !== Version) {
-            throw new TypeError('other must be a Version instance');
-        }
-        if (this.major > other.major) {
-            return true;
-        }
-        if (this.major < other.major) {
-            return false;
-        }
-        if (this.minor > other.minor) {
-            return true;
-        }
-        if (this.minor < other.minor) {
-            return false;
-        }
-        if (this.build > other.build) {
-            return true;
-        }
-        if (this.build < other.build) {
-            return false;
-        }
-        if (this.qfe > other.qfe) {
-            return true;
-        }
-        if (this.qfe < other.qfe) {
-            return false;
-        }
-        return false;
-    }
-    gte(other) {
-        if (other.constructor !== Version) {
-            throw new TypeError('other must be a Version instance');
-        }
-        if (this.major > other.major) {
-            return true;
-        }
-        if (this.major < other.major) {
-            return false;
-        }
-        if (this.minor > other.minor) {
-            return true;
-        }
-        if (this.minor < other.minor) {
-            return false;
-        }
-        if (this.build > other.build) {
-            return true;
-        }
-        if (this.build < other.build) {
-            return false;
-        }
-        if (this.qfe > other.qfe) {
-            return true;
-        }
-        if (this.qfe < other.qfe) {
-            return false;
-        }
-        return true;
-    }
-    toString() {
-        return `${this.major}.${this.minor}.${this.build}.${this.qfe}`;
-    }
-    static compare(x, y) {
-        if (x.constructor !== Version || y.constructor !== Version) {
-            throw new TypeError('Only can compare Version objects');
-        }
-        return x.gt(y) ? 1 : x.eq(y) ? 0 : -1;
-    }
-    static fromString(str) {
-        const version = Version.tryParse(str);
-        if (!version) {
-            throw new TypeError('Cannot construct a version from "' + str + '".');
-        }
-        return version;
-    }
-    static tryParse(str) {
-        if (VERSION_EXPRESSION.test(str)) {
-            const versionArray = str.split('.').map(x => parseInt(x, 10));
-            return new Version(versionArray[0], versionArray[1], versionArray[2], versionArray[3]);
-        }
-        return null;
-    }
-}
-exports.default = Version;
+"use strict";
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ * @format
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const VERSION_EXPRESSION = /^\d{1,8}(\.\d{1,8}){0,3}$/;
+class Version {
+    constructor(major, minor = 0, build = 0, qfe = 0) {
+        this.major = major;
+        this.minor = minor;
+        this.build = build;
+        this.qfe = qfe;
+    }
+    eq(other) {
+        if (other.constructor !== Version) {
+            throw new TypeError('other must be a Version instance');
+        }
+        return (this.major === other.major &&
+            this.minor === other.minor &&
+            this.build === other.build &&
+            this.qfe === other.qfe);
+    }
+    gt(other) {
+        if (other.constructor !== Version) {
+            throw new TypeError('other must be a Version instance');
+        }
+        if (this.major > other.major) {
+            return true;
+        }
+        if (this.major < other.major) {
+            return false;
+        }
+        if (this.minor > other.minor) {
+            return true;
+        }
+        if (this.minor < other.minor) {
+            return false;
+        }
+        if (this.build > other.build) {
+            return true;
+        }
+        if (this.build < other.build) {
+            return false;
+        }
+        if (this.qfe > other.qfe) {
+            return true;
+        }
+        if (this.qfe < other.qfe) {
+            return false;
+        }
+        return false;
+    }
+    gte(other) {
+        if (other.constructor !== Version) {
+            throw new TypeError('other must be a Version instance');
+        }
+        if (this.major > other.major) {
+            return true;
+        }
+        if (this.major < other.major) {
+            return false;
+        }
+        if (this.minor > other.minor) {
+            return true;
+        }
+        if (this.minor < other.minor) {
+            return false;
+        }
+        if (this.build > other.build) {
+            return true;
+        }
+        if (this.build < other.build) {
+            return false;
+        }
+        if (this.qfe > other.qfe) {
+            return true;
+        }
+        if (this.qfe < other.qfe) {
+            return false;
+        }
+        return true;
+    }
+    toString() {
+        return `${this.major}.${this.minor}.${this.build}.${this.qfe}`;
+    }
+    static compare(x, y) {
+        if (x.constructor !== Version || y.constructor !== Version) {
+            throw new TypeError('Only can compare Version objects');
+        }
+        return x.gt(y) ? 1 : x.eq(y) ? 0 : -1;
+    }
+    static fromString(str) {
+        const version = Version.tryParse(str);
+        if (!version) {
+            throw new TypeError('Cannot construct a version from "' + str + '".');
+        }
+        return version;
+    }
+    static tryParse(str) {
+        if (VERSION_EXPRESSION.test(str)) {
+            const versionArray = str.split('.').map(x => parseInt(x, 10));
+            return new Version(versionArray[0], versionArray[1], versionArray[2], versionArray[3]);
+        }
+        return null;
+    }
+}
+exports.default = Version;
 //# sourceMappingURL=version.js.map

package/lib-commonjs/utils/version.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/utils/version.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nconst VERSION_EXPRESSION = /^\\d{1,8}(\\.\\d{1,8}){0,3}$/;\n\nexport default class Version {\n  constructor(\n    private readonly major: number,\n    private readonly minor: number = 0,\n    private readonly build: number = 0,\n    private readonly qfe: number = 0,\n  ) {}\n\n  eq(other: Version): boolean {\n    if (other.constructor !== Version) {\n      throw new TypeError('other must be a Version instance');\n    }\n\n    return (\n      this.major === other.major &&\n      this.minor === other.minor &&\n      this.build === other.build &&\n      this.qfe === other.qfe\n    );\n  }\n\n  gt(other: Version): boolean {\n    if (other.constructor !== Version) {\n      throw new TypeError('other must be a Version instance');\n    }\n\n    if (this.major > other.major) {\n      return true;\n    }\n    if (this.major < other.major) {\n      return false;\n    }\n    if (this.minor > other.minor) {\n      return true;\n    }\n    if (this.minor < other.minor) {\n      return false;\n    }\n    if (this.build > other.build) {\n      return true;\n    }\n    if (this.build < other.build) {\n      return false;\n    }\n    if (this.qfe > other.qfe) {\n      return true;\n    }\n    if (this.qfe < other.qfe) {\n      return false;\n    }\n\n    return false;\n  }\n\n  gte(other: Version): boolean {\n    if (other.constructor !== Version) {\n      throw new TypeError('other must be a Version instance');\n    }\n\n    if (this.major > other.major) {\n      return true;\n    }\n    if (this.major < other.major) {\n      return false;\n    }\n    if (this.minor > other.minor) {\n      return true;\n    }\n    if (this.minor < other.minor) {\n      return false;\n    }\n    if (this.build > other.build) {\n      return true;\n    }\n    if (this.build < other.build) {\n      return false;\n    }\n    if (this.qfe > other.qfe) {\n      return true;\n    }\n    if (this.qfe < other.qfe) {\n      return false;\n    }\n\n    return true;\n  }\n\n  toString(): string {\n    return `${this.major}.${this.minor}.${this.build}.${this.qfe}`;\n  }\n\n  static compare(x: Version, y: Version): number {\n    if (x.constructor !== Version || y.constructor !== Version) {\n      throw new TypeError('Only can compare Version objects');\n    }\n\n    return x.gt(y) ? 1 : x.eq(y) ? 0 : -1;\n  }\n\n  static fromString(str: string): Version {\n    const version = Version.tryParse(str);\n    if (!version) {\n      throw new TypeError('Cannot construct a version from \"' + str + '\".');\n    }\n    return version;\n  }\n\n  static tryParse(str: string): Version | null {\n    if (VERSION_EXPRESSION.test(str)) {\n      const versionArray = str.split('.').map(x => parseInt(x, 10));\n      return new Version(\n        versionArray[0],\n        versionArray[1],\n        versionArray[2],\n        versionArray[3],\n      );\n    }\n    return null;\n  }\n}\n"]}

package/lib-commonjs/{runWindows/utils → utils}/vsInstalls.d.ts

@@ -1,34 +1,34 @@
-/**
- * Copyright (c) Microsoft Corporation.
- * Licensed under the MIT License.
- * @format
- */
-/**
- * A subset of the per-instance properties returned by vswhere
- */
-interface VisualStudioInstallation {
-    instanceId: string;
-    installationPath: string;
-    installationVersion: string;
-    prerelease: string;
-}
-/**
- * Enumerate the installed versions of Visual Studio
- */
-export declare function enumerateVsInstalls(opts: {
-    requires?: string[];
-    version?: string;
-    verbose?: boolean;
-    latest?: boolean;
-    prerelease?: boolean;
-}): VisualStudioInstallation[];
-/**
- * Find the latest available VS installation that matches the given constraints
- */
-export declare function findLatestVsInstall(opts: {
-    requires?: string[];
-    version?: string;
-    verbose?: boolean;
-    prerelease?: boolean;
-}): VisualStudioInstallation | null;
-export {};
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ * @format
+ */
+/**
+ * A subset of the per-instance properties returned by vswhere
+ */
+interface VisualStudioInstallation {
+    instanceId: string;
+    installationPath: string;
+    installationVersion: string;
+    prerelease: string;
+}
+/**
+ * Enumerate the installed versions of Visual Studio
+ */
+export declare function enumerateVsInstalls(opts: {
+    requires?: string[];
+    minVersion?: string;
+    verbose?: boolean;
+    latest?: boolean;
+    prerelease?: boolean;
+}): VisualStudioInstallation[];
+/**
+ * Find the latest available VS installation that matches the given constraints
+ */
+export declare function findLatestVsInstall(opts: {
+    requires?: string[];
+    minVersion?: string;
+    verbose?: boolean;
+    prerelease?: boolean;
+}): VisualStudioInstallation | null;
+export {};

package/lib-commonjs/utils/vsInstalls.js

@@ -0,0 +1,100 @@
+"use strict";
+/**
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
+ * @format
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.findLatestVsInstall = exports.enumerateVsInstalls = void 0;
+const telemetry_1 = require("@react-native-windows/telemetry");
+const child_process_1 = require("child_process");
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
+const semver_1 = __importDefault(require("semver"));
+/**
+ * Helper to run vswhere in JSON mode
+ *
+ * @param args Arguments to pass to vsWhere
+ * @param verbose enable verbose logging
+ */
+function vsWhere(args, verbose) {
+    // This path is maintained and VS has promised to keep it valid.
+    const vsWherePath = path_1.default.join(process.env['ProgramFiles(x86)'] || process.env.ProgramFiles, '/Microsoft Visual Studio/Installer/vswhere.exe');
+    if (verbose) {
+        console.log('Looking for vswhere at: ' + vsWherePath);
+    }
+    if (!fs_1.default.existsSync(vsWherePath)) {
+        throw new telemetry_1.CodedError('NoVSWhere', `Unable to find vswhere at ${vsWherePath}`);
+    }
+    const system32 = `${process.env.SystemRoot}\\System32`;
+    const cmdline = `${system32}\\cmd.exe /c ${system32}\\chcp.com 65001>nul && "${vsWherePath}" ${args.join(' ')} -format json -utf8`;
+    const json = JSON.parse((0, child_process_1.execSync)(cmdline).toString());
+    for (const entry of json) {
+        entry.prerelease = entry.catalog.productMilestoneIsPreRelease;
+    }
+    return json;
+}
+/**
+ * Enumerate the installed versions of Visual Studio
+ */
+function enumerateVsInstalls(opts) {
+    const args = [];
+    if (opts.minVersion) {
+        // VS 2019 ex: minVersion == 16.7 => [16.7,17.0)
+        // VS 2022 ex: minVersion == 17.0 => [17.0,18.0)
+        // Try to parse minVersion as both a Number and SemVer
+        const minVersionNum = Number(opts.minVersion);
+        const minVersionSemVer = semver_1.default.parse(opts.minVersion);
+        let minVersion;
+        let maxVersion;
+        if (minVersionSemVer) {
+            minVersion = minVersionSemVer.toString();
+            maxVersion = (minVersionSemVer.major + 1).toFixed(1);
+        }
+        else if (!Number.isNaN(minVersionNum)) {
+            minVersion = minVersionNum.toFixed(1);
+            maxVersion = (Math.floor(minVersionNum) + 1).toFixed(1);
+        }
+        else {
+            // Unable to parse minVersion and determine maxVersion,
+            // caller will throw error that version couldn't be found.
+            return [];
+        }
+        const versionRange = `[${minVersion},${maxVersion}` + (opts.prerelease ? ']' : ')');
+        if (opts.verbose) {
+            console.log(`Looking for VS installs with version range: ${versionRange}`);
+        }
+        args.push(`-version ${versionRange}`);
+    }
+    if (opts.requires) {
+        args.push(`-requires ${opts.requires.join(' ')}`);
+    }
+    if (opts.latest) {
+        args.push('-latest');
+    }
+    if (opts.prerelease) {
+        args.push('-prerelease');
+    }
+    return vsWhere(args, opts.verbose);
+}
+exports.enumerateVsInstalls = enumerateVsInstalls;
+/**
+ * Find the latest available VS installation that matches the given constraints
+ */
+function findLatestVsInstall(opts) {
+    let installs = enumerateVsInstalls({ ...opts, latest: true });
+    if (opts.prerelease && installs.length > 0) {
+        installs = installs.filter(x => x.prerelease === 'True');
+    }
+    if (installs.length > 0) {
+        return installs[0];
+    }
+    else {
+        return null;
+    }
+}
+exports.findLatestVsInstall = findLatestVsInstall;
+//# sourceMappingURL=vsInstalls.js.map

package/lib-commonjs/utils/vsInstalls.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vsInstalls.js","sourceRoot":"","sources":["../../src/utils/vsInstalls.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport {CodedError} from '@react-native-windows/telemetry';\nimport {execSync} from 'child_process';\nimport fs from '@react-native-windows/fs';\nimport path from 'path';\nimport semver from 'semver';\n\n/**\n * A subset of the per-instance properties returned by vswhere\n */\ninterface VisualStudioInstallation {\n  instanceId: string;\n  installationPath: string;\n  installationVersion: string;\n  prerelease: string;\n}\n\n/**\n * Helper to run vswhere in JSON mode\n *\n * @param args Arguments to pass to vsWhere\n * @param verbose enable verbose logging\n */\nfunction vsWhere(args: string[], verbose?: boolean): any[] {\n  // This path is maintained and VS has promised to keep it valid.\n  const vsWherePath = path.join(\n    process.env['ProgramFiles(x86)'] || process.env.ProgramFiles!,\n    '/Microsoft Visual Studio/Installer/vswhere.exe',\n  );\n\n  if (verbose) {\n    console.log('Looking for vswhere at: ' + vsWherePath);\n  }\n\n  if (!fs.existsSync(vsWherePath)) {\n    throw new CodedError(\n      'NoVSWhere',\n      `Unable to find vswhere at ${vsWherePath}`,\n    );\n  }\n\n  const system32 = `${process.env.SystemRoot}\\\\System32`;\n  const cmdline = `${system32}\\\\cmd.exe /c ${system32}\\\\chcp.com 65001>nul && \"${vsWherePath}\" ${args.join(\n    ' ',\n  )} -format json -utf8`;\n  const json = JSON.parse(execSync(cmdline).toString());\n\n  for (const entry of json) {\n    entry.prerelease = entry.catalog.productMilestoneIsPreRelease;\n  }\n\n  return json;\n}\n\n/**\n * Enumerate the installed versions of Visual Studio\n */\nexport function enumerateVsInstalls(opts: {\n  requires?: string[];\n  minVersion?: string;\n  verbose?: boolean;\n  latest?: boolean;\n  prerelease?: boolean;\n}): VisualStudioInstallation[] {\n  const args: string[] = [];\n\n  if (opts.minVersion) {\n    // VS 2019 ex: minVersion == 16.7 => [16.7,17.0)\n    // VS 2022 ex: minVersion == 17.0 => [17.0,18.0)\n\n    // Try to parse minVersion as both a Number and SemVer\n    const minVersionNum = Number(opts.minVersion);\n    const minVersionSemVer = semver.parse(opts.minVersion);\n\n    let minVersion: string;\n    let maxVersion: string;\n\n    if (minVersionSemVer) {\n      minVersion = minVersionSemVer.toString();\n      maxVersion = (minVersionSemVer.major + 1).toFixed(1);\n    } else if (!Number.isNaN(minVersionNum)) {\n      minVersion = minVersionNum.toFixed(1);\n      maxVersion = (Math.floor(minVersionNum) + 1).toFixed(1);\n    } else {\n      // Unable to parse minVersion and determine maxVersion,\n      // caller will throw error that version couldn't be found.\n      return [];\n    }\n\n    const versionRange =\n      `[${minVersion},${maxVersion}` + (opts.prerelease ? ']' : ')');\n\n    if (opts.verbose) {\n      console.log(\n        `Looking for VS installs with version range: ${versionRange}`,\n      );\n    }\n\n    args.push(`-version ${versionRange}`);\n  }\n\n  if (opts.requires) {\n    args.push(`-requires ${opts.requires.join(' ')}`);\n  }\n\n  if (opts.latest) {\n    args.push('-latest');\n  }\n\n  if (opts.prerelease) {\n    args.push('-prerelease');\n  }\n\n  return vsWhere(args, opts.verbose);\n}\n\n/**\n * Find the latest available VS installation that matches the given constraints\n */\nexport function findLatestVsInstall(opts: {\n  requires?: string[];\n  minVersion?: string;\n  verbose?: boolean;\n  prerelease?: boolean;\n}): VisualStudioInstallation | null {\n  let installs = enumerateVsInstalls({...opts, latest: true});\n\n  if (opts.prerelease && installs.length > 0) {\n    installs = installs.filter(x => x.prerelease === 'True');\n  }\n\n  if (installs.length > 0) {\n    return installs[0];\n  } else {\n    return null;\n  }\n}\n"]}

package/lib-commonjs/{runWindows/utils → utils}/vstools.d.ts

@@ -1,15 +1,16 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License.
- * @format
- */
-import { Project } from '../../config/projectConfig';
-/**
- * Adds the necessary info from a VS project into a VS solution file so that it will build.
- * @param slnFile The Absolute path to the target VS solution file.
- * @param project The object representing the project info.
- * @param verbose If true, enable verbose logging.
- * @param checkMode It true, don't make any changes.
- * @return Whether any changes were necessary.
- */
-export declare function addProjectToSolution(slnFile: string, project: Project, verbose?: boolean, checkMode?: boolean): boolean;
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * @format
+ */
+import { Project } from '../commands/config/projectConfig';
+export declare const dotNetCoreProjectTypeGuid = "{9A19103F-16F7-4668-BE54-9A1E7A4F7556}";
+/**
+ * Adds the necessary info from a VS project into a VS solution file so that it will build.
+ * @param slnFile The Absolute path to the target VS solution file.
+ * @param project The object representing the project info.
+ * @param verbose If true, enable verbose logging.
+ * @param checkMode It true, don't make any changes.
+ * @return Whether any changes were necessary.
+ */
+export declare function addProjectToSolution(slnFile: string, project: Project, verbose?: boolean, checkMode?: boolean): boolean;

package/lib-commonjs/utils/vstools.js

@@ -0,0 +1,190 @@
+"use strict";
+/**
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ * @format
+ */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addProjectToSolution = exports.dotNetCoreProjectTypeGuid = void 0;
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
+const telemetry_1 = require("@react-native-windows/telemetry");
+const projectTypeGuidsByLanguage = {
+    cpp: '{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}',
+    cs: '{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}',
+};
+exports.dotNetCoreProjectTypeGuid = '{9A19103F-16F7-4668-BE54-9A1E7A4F7556}';
+/**
+ * Checks is the given block of lines exists within an array of lines.
+ * @param lines The array of lines to search.
+ * @param block The block of lines to search for.
+ * @return The starting index the block within lines, if it exists.
+ */
+function linesContainsBlock(lines, block) {
+    if (block.length > 0) {
+        const startIndex = lines.findIndex(s => block[0] instanceof RegExp ? s.match(block[0]) : s === block[0]);
+        if (startIndex >= 0) {
+            for (let i = 1; i < block.length; i++) {
+                if (block[i] instanceof RegExp
+                    ? !lines[startIndex + i].match(block[i])
+                    : lines[startIndex + i] !== block[i]) {
+                    return -1;
+                }
+            }
+            return startIndex;
+        }
+    }
+    return -1;
+}
+/**
+ * Insert the given block of lines into an array of lines.
+ * @param lines The array of lines to insert into.
+ * @param block The block of lines to insert.
+ * @param index The index to perform the insert.
+ */
+function insertBlockIntoLines(lines, block, index) {
+    for (let i = 0; i < block.length; i++) {
+        lines.splice(index + i, 0, block[i]);
+    }
+}
+/**
+ * Overwrite the lines at the given index with the block.
+ * @param lines The destination array of lines to.
+ * @param block The source block of lines.
+ * @param index The index to perform the overwrite.
+ */
+function overwriteLinesWithBlock(lines, block, index) {
+    for (let i = 0; i < block.length; i++) {
+        lines[index + i] = block[i];
+    }
+}
+/**
+ * Search through an array of lines for a block of lines starting with startLine and ending with endLine.
+ * @param lines The array of lines to search.
+ * @param startLine The first line of the block.
+ * @param endLine The last line of the block.
+ * @param includeStartEnd Include the start and end lines in the result.
+ * @return The found block of lines, if found.
+ */
+function getBlockContentsFromLines(lines, startLine, endLine, includeStartEnd = true) {
+    const startIndex = lines.indexOf(startLine);
+    const endIndex = lines.indexOf(endLine, startIndex);
+    if (startIndex >= 0 && startIndex < endIndex) {
+        if (includeStartEnd) {
+            return lines.slice(startIndex, endIndex + 1);
+        }
+        else if (startIndex + 1 < endIndex) {
+            return lines.slice(startIndex + 1, endIndex);
+        }
+    }
+    return [];
+}
+/**
+ * Adds the necessary info from a VS project into a VS solution file so that it will build.
+ * @param slnFile The Absolute path to the target VS solution file.
+ * @param project The object representing the project info.
+ * @param verbose If true, enable verbose logging.
+ * @param checkMode It true, don't make any changes.
+ * @return Whether any changes were necessary.
+ */
+function addProjectToSolution(slnFile, project, verbose = false, checkMode = false) {
+    if (project.projectLang === null) {
+        throw new telemetry_1.CodedError('AddProjectToSolution', 'Unable to add project to solution, projectLang is null');
+    }
+    if (project.projectGuid === null) {
+        throw new telemetry_1.CodedError('AddProjectToSolution', 'Unable to add project to solution, projectGuid is null');
+    }
+    if (verbose) {
+        console.log(`Processing ${chalk_1.default.bold(path_1.default.basename(project.projectFile))}...`);
+    }
+    const originalSlnContents = fs_1.default.readFileSync(slnFile).toString();
+    const isCRLF = originalSlnContents.includes('\r\n');
+    const slnLines = originalSlnContents.split(isCRLF ? '\r\n' : '\n');
+    let contentsChanged = false;
+    // Check for the project entry block
+    const slnDir = path_1.default.dirname(slnFile);
+    const relProjectFile = path_1.default.relative(slnDir, project.projectFile);
+    const projectTypeGuid = 'projectTypeGuid' in project
+        ? project.projectTypeGuid
+        : projectTypeGuidsByLanguage[project.projectLang];
+    const projectGuid = project.projectGuid.toUpperCase();
+    const projectEntryBlock = [
+        `Project("${projectTypeGuid}") = "${project.projectName}", "${relProjectFile}", "${projectGuid}"`,
+        'EndProject',
+    ];
+    const projectEntryBlockRegex = [
+        new RegExp(`Project\\("${projectTypeGuid}"\\) = "${project.projectName}", "(.*)", "${projectGuid}"`),
+        'EndProject',
+    ];
+    const blockIndex = linesContainsBlock(slnLines, projectEntryBlockRegex);
+    if (blockIndex < 0) {
+        // Regex didn't match, insert
+        if (verbose) {
+            console.log(chalk_1.default.yellow('Missing project entry block, inserting.'));
+        }
+        const globalIndex = slnLines.indexOf('Global');
+        insertBlockIntoLines(slnLines, projectEntryBlock, globalIndex);
+        contentsChanged = true;
+    }
+    else if (linesContainsBlock(slnLines, projectEntryBlock) < 0) {
+        // Regex matched but project path has changed, so correct it
+        if (verbose) {
+            console.log(chalk_1.default.yellow('Existing project entry block found, overwriting.'));
+        }
+        overwriteLinesWithBlock(slnLines, projectEntryBlock, blockIndex);
+        contentsChanged = true;
+    }
+    // Check for the project configuration platforms
+    const slnConfigs = getBlockContentsFromLines(slnLines, '\tGlobalSection(SolutionConfigurationPlatforms) = preSolution', '\tEndGlobalSection', false).map(line => line.match(/\s+([\w\s|]+)\s=/)[1]);
+    const projectConfigLines = [];
+    slnConfigs.forEach(slnConfig => {
+        if (!slnConfig.endsWith('|Any CPU')) {
+            projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.ActiveCfg = ${project.projectLang === 'cpp'
+                ? slnConfig.replace('x86', 'Win32')
+                : slnConfig}`);
+            projectConfigLines.push(`\t\t${projectGuid}.${slnConfig}.Build.0 = ${project.projectLang === 'cpp'
+                ? slnConfig.replace('x86', 'Win32')
+                : slnConfig}`);
+        }
+    });
+    const projectConfigStartIndex = slnLines.indexOf('\tGlobalSection(ProjectConfigurationPlatforms) = postSolution');
+    projectConfigLines.forEach(projectConfigLine => {
+        if (!slnLines.includes(projectConfigLine)) {
+            if (verbose) {
+                const configLine = projectConfigLine.substr(projectConfigLine.indexOf('= ') + 2);
+                console.log(chalk_1.default.yellow(`Missing ${configLine} config block.`));
+            }
+            const projectConfigEndIndex = slnLines.indexOf('\tEndGlobalSection', projectConfigStartIndex);
+            slnLines.splice(projectConfigEndIndex, 0, projectConfigLine);
+            contentsChanged = true;
+        }
+    });
+    // Write out new solution file if there were changes
+    if (contentsChanged) {
+        if (verbose) {
+            console.log(chalk_1.default.yellow(`${chalk_1.default.bold(path_1.default.basename(slnFile))} needs to be updated.`));
+        }
+        if (!checkMode) {
+            if (verbose) {
+                console.log(`Writing changes to ${chalk_1.default.bold(path_1.default.basename(slnFile))}...`);
+            }
+            const slnContents = slnLines.join(isCRLF ? '\r\n' : '\n');
+            fs_1.default.writeFileSync(slnFile, slnContents, {
+                encoding: 'utf8',
+                flag: 'w',
+            });
+        }
+    }
+    else {
+        if (verbose) {
+            console.log(`No changes to ${chalk_1.default.bold(path_1.default.basename(slnFile))}.`);
+        }
+    }
+    return contentsChanged;
+}
+exports.addProjectToSolution = addProjectToSolution;
+//# sourceMappingURL=vstools.js.map