support for arm64 native tools

Author: bobbrow

Extension/package.json

@@ -6793,7 +6793,7 @@
         "node-fetch": "^2.7.0",
         "node-loader": "^2.0.0",
         "node-stream-zip": "^1.15.0",
-        "node-vcvarsall": "^1.1.1",
+        "node-vcvarsall": "^1.2.0",
         "node-vswhere": "^1.0.2",
         "plist": "^3.1.0",
         "posix-getopt": "^1.2.1",

Extension/src/LanguageServer/devcmd.ts

@@ -89,7 +89,7 @@ export async function setEnvironment(context?: vscode.ExtensionContext) {
     const host = vars['VSCMD_ARG_HOST_ARCH'];
     const target = vars['VSCMD_ARG_TGT_ARCH'];
     const arch = vcvars.getArchitecture({
-        host: match(host, { 'x86': 'x86', 'x64': 'x64' }) ?? 'x64',
+        host: match(host, { 'x86': 'x86', 'x64': 'x64', 'arm64': 'arm64' }) ?? 'x64',
         target: match(target, { 'x86': 'x86', 'x64': 'x64', 'arm64': 'ARM64', 'arm': 'ARM' }) ?? 'x64'
     });
     const settings = new CppSettings();
@@ -109,7 +109,8 @@ async function getVSInstallations() {
         all: true,
         prerelease: true,
         sort: true,
-        requires: ['Microsoft.VisualStudio.Component.VC.Tools.x86.x64']
+        requires: ['Microsoft.VisualStudio.Component.VC.Tools.x86.x64', 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'],
+        requiresAny: true
     });
 
     if (installations.length === 0) {
@@ -217,9 +218,9 @@ async function getHostsAndTargets(vcPath: string): Promise<vcvars.HostTarget[]>
     }
     const hostTargets: vcvars.HostTarget[] = [];
     for (const host of hosts) {
-        const h = match<'x86' | 'x64' | undefined>(host.toLowerCase(), { 'hostx86': 'x86', 'hostx64': 'x64' });
+        const h = match<'x86' | 'x64' | 'arm64' | undefined>(host.toLowerCase(), { 'hostx86': 'x86', 'hostx64': 'x64', 'hostarm64': 'arm64' });
         if (!h) {
-            // skip any arm/arm64 folders because there is no arm compiler
+            // skip any non-matching folders
             continue;
         }
         const targets = await fs.readdir(path.join(vcPath, host));

Extension/yarn.lock

@@ -3559,12 +3559,13 @@ node-stream-zip@^1.15.0:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-stream-zip/-/node-stream-zip-1.15.0.tgz#158adb88ed8004c6c49a396b50a6a5de3bca33ea"
   integrity sha1-FYrbiO2ABMbEmjlrUKal3jvKM+o=
 
-node-vcvarsall@^1.1.1:
-  version "1.1.1"
-  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-vcvarsall/-/node-vcvarsall-1.1.1.tgz#ec10a9fafcc7fd4033f716f82a04a2a5a13e1a62"
-  integrity sha1-7BCp+vzH/UAz9xb4KgSipaE+GmI=
+node-vcvarsall@^1.2.0:
+  version "1.2.0"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/node-vcvarsall/-/node-vcvarsall-1.2.0.tgz#995a5a8e49467f9c45ed83a71c1aa45adb44421a"
+  integrity sha1-mVpajklGf5xF7YOnHBqkWttEQho=
   dependencies:
     node-vswhere "^1.0.2"
+    semver "^7.7.3"
     tmp "^0.2.5"
 
 node-vswhere@^1.0.2:
@@ -4246,6 +4247,11 @@ semver@^7.3.4, semver@^7.3.7, semver@^7.5.4, semver@^7.6.2, semver@^7.6.3:
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/semver/-/semver-7.7.1.tgz#abd5098d82b18c6c81f6074ff2647fd3e7220c9f"
   integrity sha1-q9UJjYKxjGyB9gdP8mR/0+ciDJ8=
 
+semver@^7.7.3:
+  version "7.7.3"
+  resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha1-S19BQ9AHYzqNxnHNCm75FHuLuUY=
+
 serialize-javascript@^6.0.2:
   version "6.0.2"
   resolved "https://pkgs.dev.azure.com/azure-public/VisualCpp/_packaging/cpp_PublicPackages/npm/registry/serialize-javascript/-/serialize-javascript-6.0.2.tgz#defa1e055c83bf6d59ea805d8da862254eb6a6c2"