Merge pull request #11698 from microsoft/main

Merge for 1.18.5
microsoft · Nov 17, 2023 · e7cb0a7 · e7cb0a7
2 parents 4ba260c + b6f48cd
commit e7cb0a7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,5 +1,9 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.18.5: November 16, 2023
+### Bug Fix
+* Fix `~/vscode-cpptools` being used as the cache folder instead of `~/.cache/vscode-cpptools` on Linux. [#11693](https://github.com/microsoft/vscode-cpptools/issues/11693)
+
 ## Version 1.18.4: November 14, 2023
 ### Bug Fixes:
 * Fix 'Extract to function' not scrolling to and selecting the added header declaration. [#11676](https://github.com/microsoft/vscode-cpptools/issues/11676)

diff --git a/Extension/package.json b/Extension/package.json
@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.18.4-main",
+    "version": "1.18.5-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",

diff --git a/Extension/src/common.ts b/Extension/src/common.ts
@@ -1318,7 +1318,7 @@ export function getCacheStoragePath(): string {
             defaultCachePath = "vscode-cpptools/";
             pathEnvironmentVariable = process.env.XDG_CACHE_HOME;
             if (!pathEnvironmentVariable) {
-                pathEnvironmentVariable = os.homedir();
+                pathEnvironmentVariable = path.join(os.homedir(), ".cache");
             }
             break;
     }