Fixes for Windows ARM64 (#6337)

* Fixes for Windows ARM64
* Update node types version.

Author: sean-mcmanus

Extension/README.md

@@ -56,6 +56,7 @@ The extension has platform-specific binary dependencies, therefore installation
 `cpptools-linux-aarch64.vsix` | Linux ARM 64-bit
 `cpptools-osx.vsix` | macOS
 `cpptools-win32.vsix` | Windows 64-bit & 32-bit
+`cpptools-win-arm64.vsix` | Windows ARM64
 `cpptools-linux32.vsix` | Linux 32-bit ([available up to version 0.27.0](https://github.com/microsoft/vscode-cpptools/issues/5346))
 
 ## Contribution

Extension/package.json

@@ -2273,7 +2273,7 @@
     "@types/minimatch": "^3.0.3",
     "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^12.7.2",
+    "@types/node": "^14.14.0",
     "@types/plist": "^3.0.2",
     "@types/semver": "^7.1.0",
     "@types/tmp": "^0.1.0",
@@ -2405,6 +2405,27 @@
       "platforms": [
         "win32"
       ],
+      "architectures": [
+        "x86_64",
+        "x86",
+        "i686",
+        "i386"
+      ],
+      "binaries": [
+        "./bin/cpptools.exe",
+        "./bin/cpptools-srv.exe"
+      ],
+      "integrity": "BA67FC5F787552BE73F6613E08D1374FE3E3C3501417CF03E1D871A46DE4224A"
+    },
+    {
+      "description": "C/C++ language components (Windows ARM64)",
+      "url": "https://go.microsoft.com/fwlink/?linkid=2144139",
+      "platforms": [
+        "win32"
+      ],
+      "architectures": [
+        "arm64"
+      ],
       "binaries": [
         "./bin/cpptools.exe",
         "./bin/cpptools-srv.exe"
@@ -2573,6 +2594,12 @@
       "platforms": [
         "win32"
       ],
+      "architectures": [
+        "x86_64",
+        "x86",
+        "i686",
+        "i386"
+      ],
       "binaries": [
         "./debugAdapters/vsdbg/bin/vsdbg.exe"
       ],

Extension/src/common.ts

@@ -581,7 +581,7 @@ export function readFileText(filePath: string, encoding: string = "utf8"): Promi
 }
 
 /** Writes content to a text file */
-export function writeFileText(filePath: string, content: string, encoding: string = "utf8"): Promise<void> {
+export function writeFileText(filePath: string, content: string, encoding: BufferEncoding = "utf8"): Promise<void> {
     const folders: string[] = filePath.split(path.sep).slice(0, -1);
     if (folders.length) {
         // create folder path if it doesn't exist

Extension/src/githubAPI.ts

@@ -114,7 +114,15 @@ function getArrayOfBuilds(input: any): Build[] {
 export function vsixNameForPlatform(info: PlatformInformation): string {
     const vsixName: string | undefined = function(platformInfo): string | undefined {
         switch (platformInfo.platform) {
-            case 'win32': return 'cpptools-win32.vsix';
+            case 'win32':
+                switch (platformInfo.architecture) {
+                    case 'x86_64': return 'cpptool-win32.vsix'; // TODO: Change to cpptools-win64?
+                    case 'x86':
+                    case 'i386':
+                    case 'i686': return 'cpptools-win32.vsix';
+                    case 'arm64': return 'cpptools-win-arm64.vsix';
+                    default: throw new Error(`Unexpected Windows architecture: ${platformInfo.architecture}`);
+                }
             case 'darwin': return 'cpptools-osx.vsix';
             default: {
                 switch (platformInfo.architecture) {

Extension/src/main.ts

@@ -35,7 +35,7 @@ const disposables: vscode.Disposable[] = [];
 
 export async function activate(context: vscode.ExtensionContext): Promise<CppToolsApi & CppToolsExtension> {
     let errMsg: string = "";
-    if (process.arch !== 'x64' && (process.platform !== 'win32' || process.arch !== 'ia32') && (process.platform !== 'linux' || (process.arch !== 'x64' && process.arch !== 'arm' && process.arch !== 'arm64' && process.arch !== 'aarch64'))) {
+    if (process.arch !== 'x64' && (process.platform !== 'win32' || (process.arch !== 'ia32' && process.arch !== 'arm64')) && (process.platform !== 'linux' || (process.arch !== 'x64' && process.arch !== 'arm' && process.arch !== 'arm64' && process.arch !== 'aarch64'))) {
         errMsg = localize("architecture.not.supported", "Architecture {0} is not supported. ", String(process.arch));
     } else if (process.platform === 'linux' && fs.existsSync('/etc/alpine-release')) {
         errMsg = localize("apline.containers.not.supported", "Alpine containers are not supported.");

Extension/src/platform.ts

@@ -69,6 +69,9 @@ export class PlatformInformation {
 
                         // Note: This string can be localized. So, we'll just check to see if it contains 32 or 64.
                         if (arch.indexOf('64') >= 0) {
+                            if (arch.indexOf('ARM') >= 0) {
+                                return "arm64";
+                            }
                             return "x86_64";
                         } else if (arch.indexOf('32') >= 0) {
                             return "x86";

Extension/yarn.lock

@@ -162,10 +162,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.4.tgz#76c3cb3a12909510f52e5dc04a6298cdf9504ffd"
   integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==
 
-"@types/node@^12.7.2":
-  version "12.12.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.28.tgz#3a2b5f8d21f96ace690a8832ae9779114612575f"
-  integrity sha512-g73GJYJDXgf0jqg+P9S8h2acWbDXNkoCX8DLtJVu7Fkn788pzQ/oJsrdJz/2JejRf/SjfZaAhsw+3nd1D5EWGg==
+"@types/node@^14.14.0":
+  version "14.14.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.0.tgz#f1091b6ad5de18e8e91bdbd43ec63f13de372538"
+  integrity sha512-BfbIHP9IapdupGhq/hc+jT5dyiBVZ2DdeC5WwJWQWDb0GijQlzUFAeIQn/2GtvZcd2HVUU7An8felIICFTC2qg==
 
 "@types/plist@^3.0.2":
   version "3.0.2"

README.md

@@ -56,6 +56,7 @@ The extension has platform-specific binary dependencies, therefore installation
 `cpptools-linux-aarch64.vsix` | Linux ARM 64-bit
 `cpptools-osx.vsix` | macOS
 `cpptools-win32.vsix` | Windows 64-bit & 32-bit
+`cpptools-win-arm64.visix` | Windows ARM64
 `cpptools-linux32.vsix` | Linux 32-bit ([available up to version 0.27.0](https://github.com/microsoft/vscode-cpptools/issues/5346))
 
 ## Contribution