@react-native-windows/cli 0.0.0-canary.2 → 0.0.0-canary.200

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

@@ -3,7 +3,8 @@
  * Licensed under the MIT License.
  * @format
  */
-import { Project } from '../../config/projectConfig';
+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.

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

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

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

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

@@ -7,13 +7,13 @@ declare class DeviceInfo {
     readonly name: string;
     readonly guid: string;
     readonly ip: string;
-    private index;
-    private type;
+    private readonly index;
+    private readonly type;
     constructor(name: string, guid: string, ip: string, index: number, type: string);
     toString(): string;
 }
 export default class WinAppDeployTool {
-    private path;
+    private readonly path;
     constructor();
     get isAvailable(): boolean;
     findDevice(target: string): DeviceInfo;

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

@@ -4,11 +4,15 @@
  * 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 });
-const fs = require("fs");
-const path = require("path");
+const fs_1 = __importDefault(require("@react-native-windows/fs"));
+const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const commandWithProgress_1 = require("./commandWithProgress");
+const telemetry_1 = require("@react-native-windows/telemetry");
 function sortDevices(l, r) {
     return l.toString().length - r.toString().length;
 }
@@ -27,21 +31,20 @@ class DeviceInfo {
 class WinAppDeployTool {
     constructor() {
         const programFilesPath = process.env['ProgramFiles(x86)'] || process.env.ProgramFiles;
-        this.path = path.join(programFilesPath, 'Windows Kits', '10', 'bin', 'x86', 'WinAppDeployCmd.exe');
+        this.path = path_1.default.join(programFilesPath, 'Windows Kits', '10', 'bin', 'x86', 'WinAppDeployCmd.exe');
     }
     get isAvailable() {
-        return fs.existsSync(this.path);
+        return fs_1.default.existsSync(this.path);
     }
     findDevice(target) {
         const devices = this.enumerateDevices();
         if (devices.length === 0) {
-            throw new Error('No devices found');
+            throw new telemetry_1.CodedError('NoDevice', 'No devices found');
         }
         if (target === 'emulator') {
             const sortedList = devices.sort(sortDevices);
-            for (let i = 0; i < sortedList.length; i++) {
-                const sortedItem = sortedList[i];
-                if (sortedItem.toString().indexOf(target) > -1) {
+            for (const sortedItem of sortedList) {
+                if (sortedItem.toString().includes(target)) {
                     return sortedItem;
                 }
             }
@@ -54,7 +57,7 @@ class WinAppDeployTool {
             return candidateList[0];
         }
         else {
-            throw new Error('No devices found');
+            throw new telemetry_1.CodedError('NoDevice', 'No devices found');
         }
     }
     enumerateDevices() {
@@ -63,13 +66,13 @@ class WinAppDeployTool {
         // [(line), '127.0.0.1', '00000015-b21e-0da9-0000-000000000000', 'Lumia 1520 (RM-940)']
         // The expansion is: IP address, spaces, GUID, spaces, text name
         const LINE_TEST = /^([\d\.]+?)\s+([\da-fA-F\-]+?)\s+(.+)$/m; // eslint-disable-line no-useless-escape
-        const result = child_process_1.execSync(`"${this.path}" devices`).toString();
+        const result = (0, child_process_1.execSync)(`"${this.path}" devices`).toString();
         const lines = result.split('\r\n');
         const matchedLines = lines.filter(line => LINE_TEST.test(line));
         const devices = matchedLines.map((line, arrayIndex) => {
             const match = line.match(LINE_TEST);
             if (!match) {
-                throw new Error('Unexpected format of "devices" output');
+                throw new telemetry_1.CodedError('InvalidDevicesOutput', 'Unexpected format of "devices" output');
             }
             const ip = match[1];
             const guid = match[2];
@@ -83,7 +86,7 @@ class WinAppDeployTool {
     async installAppPackage(pathToAppxPackage, targetDevice, shouldLaunch, shouldUpdate, pin, verbose = false) {
         const text = `Installing app to ${targetDevice.name}`;
         if (shouldLaunch) {
-            commandWithProgress_1.newWarn('Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.');
+            (0, commandWithProgress_1.newWarn)('Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.');
         }
         const args = [
             shouldUpdate ? 'update' : 'install',
@@ -95,11 +98,11 @@ class WinAppDeployTool {
         if (pin) {
             args.push('-pin', pin.toString());
         }
-        await commandWithProgress_1.commandWithProgress(commandWithProgress_1.newSpinner(text), text, this.path, args, verbose);
+        await (0, commandWithProgress_1.commandWithProgress)((0, commandWithProgress_1.newSpinner)(text), text, this.path, args, verbose, 'InstallAppToDeviceFailure');
     }
     async uninstallAppPackage(appName, targetDevice, verbose) {
         const text = `Uninstalling app from ${targetDevice.name}`;
-        await commandWithProgress_1.commandWithProgress(commandWithProgress_1.newSpinner(text), text, this.path, `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '), verbose);
+        await (0, commandWithProgress_1.commandWithProgress)((0, commandWithProgress_1.newSpinner)(text), text, this.path, `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '), verbose, 'UninstallAppOnDeviceFailure');
     }
 }
 exports.default = WinAppDeployTool;

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

@@ -0,0 +1 @@
+{"version":3,"file":"winappdeploytool.js","sourceRoot":"","sources":["../../src/utils/winappdeploytool.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\nimport fs from '@react-native-windows/fs';\nimport path from 'path';\nimport {execSync} from 'child_process';\nimport {newSpinner, commandWithProgress, newWarn} from './commandWithProgress';\nimport {CodedError} from '@react-native-windows/telemetry';\n\nfunction sortDevices(l: DeviceInfo, r: DeviceInfo): number {\n  return l.toString().length - r.toString().length;\n}\n\nclass DeviceInfo {\n  constructor(\n    public readonly name: string,\n    public readonly guid: string,\n    public readonly ip: string,\n\n    private readonly index: number,\n    private readonly type: string,\n  ) {}\n\n  toString() {\n    return `${this.index}. ${this.name} (${this.type})`;\n  }\n}\n\nexport default class WinAppDeployTool {\n  private readonly path: string;\n\n  constructor() {\n    const programFilesPath =\n      process.env['ProgramFiles(x86)'] || process.env.ProgramFiles;\n    this.path = path.join(\n      programFilesPath!,\n      'Windows Kits',\n      '10',\n      'bin',\n      'x86',\n      'WinAppDeployCmd.exe',\n    );\n  }\n\n  get isAvailable() {\n    return fs.existsSync(this.path);\n  }\n\n  findDevice(target: string): DeviceInfo {\n    const devices = this.enumerateDevices();\n\n    if (devices.length === 0) {\n      throw new CodedError('NoDevice', 'No devices found');\n    }\n\n    if (target === 'emulator') {\n      const sortedList = devices.sort(sortDevices);\n      for (const sortedItem of sortedList) {\n        if (sortedItem.toString().includes(target)) {\n          return sortedItem;\n        }\n      }\n    }\n\n    if (target === 'device') {\n      return devices[0];\n    }\n\n    const candidateList = devices.filter(device => device.guid === target);\n\n    if (candidateList.length > 0) {\n      return candidateList[0];\n    } else {\n      throw new CodedError('NoDevice', 'No devices found');\n    }\n  }\n\n  enumerateDevices(): DeviceInfo[] {\n    // 127.0.0.1   00000015-b21e-0da9-0000-000000000000    Lumia 1520 (RM-940)\\r\n    //  maps to\n    // [(line), '127.0.0.1', '00000015-b21e-0da9-0000-000000000000', 'Lumia 1520 (RM-940)']\n    // The expansion is: IP address, spaces, GUID, spaces, text name\n    const LINE_TEST = /^([\\d\\.]+?)\\s+([\\da-fA-F\\-]+?)\\s+(.+)$/m; // eslint-disable-line no-useless-escape\n\n    const result = execSync(`\"${this.path}\" devices`).toString();\n    const lines = result.split('\\r\\n');\n    const matchedLines = lines.filter(line => LINE_TEST.test(line));\n\n    const devices = matchedLines.map((line, arrayIndex) => {\n      const match = line.match(LINE_TEST);\n      if (!match) {\n        throw new CodedError(\n          'InvalidDevicesOutput',\n          'Unexpected format of \"devices\" output',\n        );\n      }\n\n      const ip = match[1];\n      const guid = match[2];\n      const name = match[3];\n      const type = 'device';\n\n      const deviceInfo = new DeviceInfo(name, guid, ip, arrayIndex, type);\n      return deviceInfo;\n    });\n\n    return devices;\n  }\n\n  async installAppPackage(\n    pathToAppxPackage: string,\n    targetDevice: DeviceInfo,\n    shouldLaunch: boolean,\n    shouldUpdate: boolean,\n    pin: boolean,\n    verbose: boolean = false,\n  ) {\n    const text = `Installing app to ${targetDevice.name}`;\n\n    if (shouldLaunch) {\n      newWarn(\n        'Cannot launch app with current version of Windows 10 SDK tools.  You will have to launch the app after installation is completed.',\n      );\n    }\n\n    const args = [\n      shouldUpdate ? 'update' : 'install',\n      '-file',\n      pathToAppxPackage,\n      '-ip',\n      targetDevice.ip,\n    ];\n\n    if (pin) {\n      args.push('-pin', pin.toString());\n    }\n    await commandWithProgress(\n      newSpinner(text),\n      text,\n      this.path,\n      args,\n      verbose,\n      'InstallAppToDeviceFailure',\n    );\n  }\n\n  async uninstallAppPackage(\n    appName: string,\n    targetDevice: DeviceInfo,\n    verbose: boolean,\n  ) {\n    const text = `Uninstalling app from ${targetDevice.name}`;\n    await commandWithProgress(\n      newSpinner(text),\n      text,\n      this.path,\n      `uninstall -package ${appName} -ip {$targetDevice.ip}`.split(' '),\n      verbose,\n      'UninstallAppOnDeviceFailure',\n    );\n  }\n}\n"]}

package/package.json

@@ -1,59 +1,77 @@
 {
   "name": "@react-native-windows/cli",
-  "version": "0.0.0-canary.2",
+  "version": "0.0.0-canary.200",
   "license": "MIT",
   "main": "lib-commonjs/index.js",
   "repository": {
     "type": "git",
-    "url": "git@github.com:microsoft/react-native-windows.git",
+    "url": "https://github.com/microsoft/react-native-windows",
     "directory": "packages/@react-native-windows/cli"
   },
   "scripts": {
-    "build": "just-scripts build",
-    "clean": "just-scripts clean",
-    "lint": "just-scripts lint",
-    "lint:fix": "just-scripts lint:fix",
-    "watch": "just-scripts watch"
+    "build": "rnw-scripts build",
+    "clean": "rnw-scripts clean",
+    "lint": "rnw-scripts lint",
+    "lint:fix": "rnw-scripts lint:fix",
+    "test": "rnw-scripts test",
+    "watch": "rnw-scripts watch"
   },
   "dependencies": {
-    "chalk": "^3.0.0",
+    "@react-native-windows/codegen": "0.0.0-canary.76",
+    "@react-native-windows/fs": "^0.0.0-canary.33",
+    "@react-native-windows/package-utils": "^0.0.0-canary.59",
+    "@react-native-windows/telemetry": "^0.0.0-canary.84",
+    "@xmldom/xmldom": "^0.7.7",
+    "chalk": "^4.1.0",
     "cli-spinners": "^2.2.0",
     "envinfo": "^7.5.0",
+    "find-up": "^4.1.0",
     "glob": "^7.1.1",
-    "inquirer": "^3.0.6",
+    "lodash": "^4.17.15",
     "mustache": "^4.0.1",
-    "nuget-exe": "4.9.2",
     "ora": "^3.4.0",
-    "semver": "^7.1.3",
-    "shelljs": "^0.7.8",
+    "prompts": "^2.4.1",
+    "semver": "^7.3.2",
+    "shelljs": "^0.8.4",
     "username": "^5.1.0",
     "uuid": "^3.3.2",
-    "xmldom": "^0.3.0",
+    "xml-formatter": "^2.4.0",
     "xml-parser": "^1.2.1",
     "xpath": "^0.0.27"
   },
   "devDependencies": {
-    "@react-native-community/cli-types": "^4.10.1",
-    "@rnw-scripts/eslint-config": "0.0.2",
-    "@rnw-scripts/just-task": "0.0.2",
-    "@rnw-scripts/ts-config": "0.1.0",
+    "@react-native-community/cli-doctor": "12.0.0-alpha.12",
+    "@react-native-community/cli-types": "12.0.0-alpha.12",
+    "@rnw-scripts/eslint-config": "1.2.5",
+    "@rnw-scripts/jest-unittest-config": "1.5.7",
+    "@rnw-scripts/just-task": "2.3.20",
+    "@rnw-scripts/ts-config": "2.0.5",
     "@types/chalk": "^2.2.0",
-    "@types/inquirer": "^6.5.0",
-    "@types/mustache": "^4.0.1",
+    "@types/jest": "^29.2.2",
+    "@types/lodash": "^4.14.168",
+    "@types/mustache": "^4.1.1",
+    "@types/node": "^18.0.0",
     "@types/ora": "^3.2.0",
-    "@types/semver": "^7.3.1",
+    "@types/prompts": "2.0.10",
+    "@types/semver": "^7.3.3",
     "@types/shelljs": "^0.8.8",
-    "@types/uuid": "^8.0.0",
-    "@types/xmldom": "^0.1.29",
+    "@types/uuid": "^8.3.0",
     "@types/xml-parser": "^1.2.29",
-    "eslint": "6.7.0",
-    "just-scripts": "^0.36.1",
-    "typescript": "^3.8.3"
+    "@types/xmldom": "^0.1.30",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.57.1",
+    "babel-jest": "^29.3.0",
+    "eslint": "^8.19.0",
+    "jest": "^29.2.1",
+    "prettier": "^2.4.1",
+    "typescript": "^4.9.5"
+  },
+  "peerDependencies": {
+    "react-native": "*"
   },
   "files": [
     "lib-commonjs",
-    "powershell",
-    "templates"
+    "src/powershell"
   ],
   "beachball": {
     "defaultNpmTag": "canary",
@@ -63,5 +81,9 @@
       "patch"
     ]
   },
-  "promoteRelease": true
+  "promoteRelease": true,
+  "windowsOnly": true,
+  "engines": {
+    "node": ">= 18"
+  }
 }

package/{powershell → src/powershell}/Add-AppDevPackage.ps1

@@ -107,10 +107,10 @@ function PrintMessageAndExit($ErrorMessage, $ReturnCode)
     {
         # Log telemetry data regarding the use of the script if possible.
         # There are three ways that this can be disabled:
-        #   1. If the "TelemetryDependencies" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
+        #   1. If the "TelDeps" folder isn't present.  This can be excluded at build time by setting the MSBuild property AppxLogTelemetryFromSideloadingScript to false
         #   2. If the SkipLoggingTelemetry switch is passed to this script.
         #   3. If Visual Studio telemetry is disabled via the registry.
-        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelemetryDependencies")
+        $TelemetryAssembliesFolder = (Join-Path $PSScriptRoot "TelDeps")
         if (!$SkipLoggingTelemetry -And (Test-Path $TelemetryAssembliesFolder))
         {
             $job = Start-Job -FilePath (Join-Path $TelemetryAssembliesFolder "LogSideloadingTelemetry.ps1") -ArgumentList $TelemetryAssembliesFolder, "VS/DesignTools/SideLoadingScript/AddAppDevPackage", $ReturnCode, $ProcessorArchitecture