From c5e66994218602f6a7b22b83c22600e8855ea83c Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Wed, 18 Dec 2019 18:11:40 -0800 Subject: [PATCH] Fix bug with Insider installation. (#4767) Fix for #3874 . This was also causing my previous "downgrade" fix to fail: #4760 --- Extension/CHANGELOG.md | 1 + Extension/src/LanguageServer/extension.ts | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index 30bf9a279e..84d14c7e24 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -4,6 +4,7 @@ ### Bug Fixes * Fix IntelliSense regression crashes. [#4754](https://github.com/microsoft/vscode-cpptools/issues/4754) * Fix Insiders channel not auto-downgrading after an Insiders vsix is unpublished. [#4760](https://github.com/microsoft/vscode-cpptools/issues/4760) +* Fix Insiders channel not working on remote targets. [#3874](https://github.com/microsoft/vscode-cpptools/issues/3874) ## Version 0.26.3-insiders: December 16, 2019 ### Bug Fixes diff --git a/Extension/src/LanguageServer/extension.ts b/Extension/src/LanguageServer/extension.ts index 80cd8939ed..7d13b895a9 100644 --- a/Extension/src/LanguageServer/extension.ts +++ b/Extension/src/LanguageServer/extension.ts @@ -633,7 +633,7 @@ function installVsix(vsixLocation: string): Thenable { // 1.33.0 introduces workbench.extensions.installExtension. 1.32.3 was immediately prior. let lastVersionWithoutInstallExtensionCommand: PackageVersion = new PackageVersion('1.32.3'); - if (userVersion.isGreaterThan(lastVersionWithoutInstallExtensionCommand)) { + if (userVersion.isGreaterThan(lastVersionWithoutInstallExtensionCommand, "insider")) { return vscode.commands.executeCommand('workbench.extensions.installExtension', vscode.Uri.file(vsixLocation)); } @@ -672,7 +672,7 @@ function installVsix(vsixLocation: string): Thenable { // 1.28.0 changes the CLI for making installations. 1.27.2 was immediately prior. let oldVersion: PackageVersion = new PackageVersion('1.27.2'); - if (userVersion.isGreaterThan(oldVersion)) { + if (userVersion.isGreaterThan(oldVersion, "insider")) { return new Promise((resolve, reject) => { let process: ChildProcess; try {