Compare commits

...
Author SHA1 Message Date
Sean McManus a88ca881ad Disable Insiders updates for unsupported cases. (#5371)
* Disable Insiders updates for unsupported cases.
2020-04-28 14:41:01 -07:00
Sean McManus 9ea6727743 Merge pull request #5218 from microsoft/seanmcm/0_27_0_release_merge2
Seanmcm/0 27 0 release merge2
2020-03-27 18:26:11 -07:00
Sean McManus bd1f66b411 Merge branch 'release' into seanmcm/0_27_0_release_merge2 2020-03-27 18:14:51 -07:00
Sean McManus c5be0b55c7 Merge pull request #5205 from microsoft/seanmcm/0_27_0_release_merge
Seanmcm/0 27 0 release merge
2020-03-26 14:07:45 -07:00
Sean McManus e8080fc86f Merge branch 'seanmcm/0_27_0_release_merge' of https://github.com/Microsoft/vscode-cpptools into seanmcm/0_27_0_release_merge 2020-03-26 13:45:08 -07:00
Sean McManus 579e4db42b Merge. 2020-03-26 13:44:36 -07:00
Sean McManus 16bc8f6e5d Merge branch 'release' into seanmcm/0_27_0_release_merge 2020-03-26 13:16:05 -07:00
Sean McManus 6c4080832b Seanmcm/0 27 0 insider4 changelog2 (#5172)
* Update changelog.
2020-03-23 14:48:36 -07:00
Sean McManus 882b62c25b Fix package.json activation events. (#5173) 2020-03-23 14:40:37 -07:00
Sean McManusandAndrew Wang 5878686eac Add cleanUnusedBinaries stage (#5170)
Our offline installer will include two versions of lldb.
./debugAdapters/lldb is lldb-mi 3.8 and is used for High-Sierra and older
./debugAdapters/lldb-mi is lldb-mi 10.x and is used for Mojave and
higher.

Co-authored-by: Andrew Wang <[email protected]>
2020-03-23 14:39:20 -07:00
Sean McManus f87944a72a Merge pull request #5158 from microsoft/seanmcm/0_27_0_insiders4_merge
Seanmcm/0 27 0 insiders4 merge
2020-03-20 17:26:01 -07:00
Sean McManus 8e0a0792b8 Merge pull request #5106 from microsoft/seanmcm/0_27_0_merge
0_27_0 merge to release
2020-03-12 14:57:51 -07:00
Sean McManus 6712181c45 Merge. 2020-03-12 14:11:19 -07:00
Sean McManus 940a720501 Update version. 2020-03-12 14:09:25 -07:00
Sean McManus 211e497a89 Merge pull request #4876 from microsoft/seanmcm/0_26_3_release
Seanmcm/0 26 3 release
2020-01-21 17:46:50 -08:00
Sean McManus f04ee43425 Merge branch 'release' into seanmcm/0_26_3_release 2020-01-21 16:52:34 -08:00
Michelle Matias 8a4bfa2183 Merge pull request #4689 from microsoft/mimatias/master-26-2
Merge for 0.26.2
2019-12-02 14:57:18 -08:00
Bob Brown c6af5ce8b5 Merge pull request #4601 from microsoft/coleng/merge_release
Merge master into release, up to 0.26.2-insiders
2019-11-14 09:28:48 -08:00
Colen Garoutte-Carson 014f30e942 Merge commit 'f0c961aa734df9fb2ca7d49649cd06b1f4e07a11' into release 2019-11-13 12:37:31 -08:00
Sean McManus d1c9d4d298 Merge pull request #4500 from microsoft/seanmcm/0_26_1_release2
Fix a missed https-proxy-agent case. (#4497)
2019-10-25 19:01:24 -07:00
Sean McManus 09ccd3af42 Merge pull request #4495 from microsoft/seanmcm/0_26_1_release
0.26.1 release
2019-10-25 16:18:54 -07:00
Sean McManus 375b64b4f8 Merge branch 'release' into seanmcm/0_26_1_release 2019-10-25 15:55:21 -07:00
Sean McManus 783ef7290a Merge for 0.26.0. 2019-10-15 16:42:02 -07:00
Sean McManus 7f1efd4b84 Merge. 2019-10-15 16:34:34 -07:00
Sean McManus d68f76b51e Merge pull request #4161 from microsoft/seanmcm/0_25_1_release
Seanmcm/0 25 1 release
2019-08-28 15:27:34 -07:00
Sean McManus 6ba1262347 Merge for 0.25.1 release. 2019-08-28 15:24:08 -07:00
Sean McManus 490fc7504f Merge pull request #4115 from microsoft/seanmcm/0_25_0_release
Seanmcm/0 25 0 release
2019-08-20 18:59:53 -07:00
Sean McManus f2959f4d7a Merge for 0.25.0 release. 2019-08-20 18:05:52 -07:00
Sean McManus fa4d7b22c1 Update package.json version. (#3948) 2019-07-19 12:33:53 -07:00
Colen Garoutte-Carson 3cb7f7e61f Merge pull request #3946 from microsoft/coleng/CherryPickAgain
Cherry pick into release for 0.24.1
2019-07-18 18:54:51 -07:00
Colen Garoutte-Carson 779f2ce2b5 Fix issue with didClose received after didOpen (#3844) 2019-07-18 18:42:51 -07:00
Colen Garoutte-Carson 0c4c83e5bd Improve scope names used by Enhanced Colorization (#3896) 2019-07-18 18:42:46 -07:00
Colen Garoutte-Carson a369ede8d9 Update changelog for 0.24.1 release (#3945) 2019-07-18 18:42:40 -07:00
Colen Garoutte-Carson 36ce8f885f Revert "cherry pick fixes for 0.24.1 (#3943)"
This reverts commit 347794b0c7.
2019-07-18 18:37:18 -07:00
Colen Garoutte-Carson 347794b0c7 cherry pick fixes for 0.24.1 (#3943) 2019-07-18 17:28:00 -07:00
Sean McManus 3ed087134c Merge pull request #3869 from microsoft/seanmcm/0_24_0_release
Seanmcm/0 24 0 release
2019-07-02 19:04:05 -07:00
Sean McManus 902355e021 Merge branch 'release' into seanmcm/0_24_0_release 2019-07-02 18:36:53 -07:00
Sean McManus 32e98912df Change version 2019-07-02 18:33:53 -07:00
Sean McManus 084a8e708c Merge pull request #3630 from microsoft/0_23_1_release
0 23 1 release
2019-05-10 15:57:24 -07:00
Sean McManus 045d50bb90 Merge branch 'release' into 0_23_1_release 2019-05-10 15:17:20 -07:00
Sean McManus 68eda19665 Update version. 2019-05-10 15:14:16 -07:00
Sean McManus 39ab866a10 Merge pull request #3595 from microsoft/seanmcm/0_23_0_release
Seanmcm/0 23 0 release
2019-05-06 18:47:28 -07:00
Sean McManus d4cdfe6994 Merge branch 'release' into seanmcm/0_23_0_release 2019-05-06 18:42:11 -07:00
Sean McManus c18592b5a3 Merge pull request #3332 from Microsoft/0_22_1_release
0 22 1 release
2019-03-20 19:06:23 -07:00
Sean McManus fee924b374 Merge branch 'release' into 0_22_1_release 2019-03-20 18:46:03 -07:00
Sean McManus 6724e13c63 Update for 0.22.1. 2019-03-20 18:44:44 -07:00
Sean McManus 717de54b06 Merge pull request #3321 from Microsoft/0_22_0_release
0 22 0 release
2019-03-19 16:52:44 -07:00
Sean McManus 51cd214f1e Merge branch 'release' into 0_22_0_release 2019-03-19 16:40:15 -07:00
Sean McManus da277c8593 Seanmcm/0 21 0 release2 (#3070)
* Update yauzl version and changelog date. (#3069)
2019-01-22 19:17:42 -08:00
Bob Brown b3cce807bb Merge pull request #3068 from Microsoft/seanmcm/0_21_0_release 2019-01-22 14:43:34 -08:00
Sean McManus a533eb9a43 Merge branch 'release' into seanmcm/0_21_0_release 2019-01-22 14:32:57 -08:00
Sean McManus 9702eae953 Update package.json. 2019-01-22 14:32:04 -08:00
Sean McManus a4b51997ff Update version. 2019-01-22 14:30:32 -08:00
Sean McManus b1274d3c76 Merge pull request #2749 from Microsoft/seanmcm/0_20_1_release
Seanmcm/0 20 1 release
2018-10-31 17:24:43 -07:00
Sean McManus 8f8565dbfd Merge branch 'seanmcm/0_20_1_release' of https://github.com/Microsoft/vscode-cpptools into seanmcm/0_20_1_release 2018-10-31 17:16:30 -07:00
Sean McManus 7f4614c31c Merge again. 2018-10-31 17:15:52 -07:00
Sean McManus e231453778 Merge branch 'release' into seanmcm/0_20_1_release 2018-10-31 16:29:33 -07:00
Sean McManus 8729804dc2 Update version. 2018-10-31 16:27:42 -07:00
Sean McManus 0cf237c839 Merge pull request #2725 from Microsoft/master
2nd merge for 0.20.0
2018-10-25 16:46:17 -07:00
Bob Brown ddc1f901c2 Merge pull request #2721 from Microsoft/seanmcm/0_20_0_release
Seanmcm/0 20 0 release
2018-10-25 16:21:08 -07:00
Sean McManus 9ca27af2df Merge. 2018-10-25 15:58:34 -07:00
Sean McManus 082435ec8b Fix comment for intelliSenseEngine setting. 2018-10-25 15:48:28 -07:00
Sean McManus 324c5f59f4 Update changelog for 0.20.0 release. 2018-10-25 15:38:26 -07:00
4 changed files with 38 additions and 16 deletions
+4
View File
@@ -1,5 +1,9 @@
# C/C++ for Visual Studio Code Change Log
## Version 0.27.1: April 28, 2020
### Bug Fix
* Disable Insiders `updateChannel` for 32-bit Linux and VS Code older than 1.43.0.
## Version 0.27.0: March 30, 2020
### Enhancements
* Improved multi-root implementation with a single language server process and database for the entire workspace (shared between workspace folders). Fixes most [multi-root bugs](https://github.com/microsoft/vscode-cpptools/issues?q=is%3Aopen+is%3Aissue+label%3A%22Feature%3A+Multiroot%22+label%3A%22fixed+%28release+pending%29%22+milestone%3A0.27.0).
+1 -1
View File
@@ -2,7 +2,7 @@
"name": "cpptools",
"displayName": "C/C++",
"description": "C/C++ IntelliSense, debugging, and code browsing.",
"version": "0.27.0-master",
"version": "0.27.1",
"publisher": "ms-vscode",
"preview": true,
"icon": "LanguageCCPP_color_128x.png",
+30 -15
View File
@@ -41,11 +41,12 @@ let ui: UI;
let disposables: vscode.Disposable[] = [];
let languageConfigurations: vscode.Disposable[] = [];
let intervalTimer: NodeJS.Timer;
let insiderUpdateEnabled: boolean = false;
let insiderUpdateTimer: NodeJS.Timer;
const insiderUpdateTimerInterval: number = 1000 * 60 * 60;
let realActivationOccurred: boolean = false;
let tempCommands: vscode.Disposable[] = [];
let activatedPreviously: PersistentWorkspaceState<boolean>;
const insiderUpdateTimerInterval: number = 1000 * 60 * 60;
let buildInfoCache: BuildInfo | undefined;
const taskSourceStr: string = "C/C++";
const cppInstallVsixStr: string = 'C/C++: Install vsix -- ';
@@ -462,12 +463,24 @@ function realActivation(): void {
vcpkgDbPromise = initVcpkgDatabase();
if (settings.updateChannel === 'Default') {
suggestInsidersChannel();
} else if (settings.updateChannel === 'Insiders') {
insiderUpdateTimer = global.setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval, settings.updateChannel);
checkAndApplyUpdate(settings.updateChannel);
}
PlatformInformation.GetPlatformInformation().then(info => {
// Skip Insiders processing for 32-bit Linux.
if (info.platform !== "linux" || info.architecture === "x86_64") {
// Skip Insiders processing for VS Code newer than 1.42.1.
// TODO: Change this to not require the hardcoded version to be updated.
let vscodeVersion: PackageVersion = new PackageVersion(vscode.version);
let minimumSupportedVersionForInsidersUpgrades: PackageVersion = new PackageVersion("1.42.1");
if (vscodeVersion.isGreaterThan(minimumSupportedVersionForInsidersUpgrades, "insider")) {
insiderUpdateEnabled = true;
if (settings.updateChannel === 'Default') {
suggestInsidersChannel();
} else if (settings.updateChannel === 'Insiders') {
insiderUpdateTimer = global.setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval, settings.updateChannel);
checkAndApplyUpdate(settings.updateChannel);
}
}
}
});
// Register a protocol handler to serve localized versions of the schema for c_cpp_properties.json
class SchemaProvider implements vscode.TextDocumentContentProvider {
@@ -511,15 +524,17 @@ function onDidChangeSettings(event: vscode.ConfigurationChangeEvent): void {
}
});
const newUpdateChannel: string = changedActiveClientSettings['updateChannel'];
if (newUpdateChannel) {
if (newUpdateChannel === 'Default') {
clearInterval(insiderUpdateTimer);
} else if (newUpdateChannel === 'Insiders') {
insiderUpdateTimer = global.setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval);
}
if (insiderUpdateEnabled) {
const newUpdateChannel: string = changedActiveClientSettings['updateChannel'];
if (newUpdateChannel) {
if (newUpdateChannel === 'Default') {
clearInterval(insiderUpdateTimer);
} else if (newUpdateChannel === 'Insiders') {
insiderUpdateTimer = global.setInterval(checkAndApplyUpdate, insiderUpdateTimerInterval);
}
checkAndApplyUpdate(newUpdateChannel);
checkAndApplyUpdate(newUpdateChannel);
}
}
}
+3
View File
@@ -132,6 +132,9 @@ async function offlineInstallation(info: PlatformInformation): Promise<void> {
setInstallationStage('cleanUpUnusedBinaries');
await cleanUpUnusedBinaries(info);
setInstallationStage('cleanUpUnusedBinaries');
await cleanUpUnusedBinaries(info);
setInstallationStage('makeBinariesExecutable');
await makeBinariesExecutable();