Merge pull request #13245 from microsoft/seanmcm/1_23_6_release

Cherry-picks for 1.23.6
microsoft · Feb 6, 2025 · c357224 · c357224
2 parents 006ebff + a636c87
commit c357224
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md
@@ -1,5 +1,12 @@
 # C/C++ for Visual Studio Code Changelog
 
+## Version 1.23.6: February 6, 2025
+### Bug Fixes
+* Fix a bug with remote attach debugging. [#13137](https://github.com/microsoft/vscode-cpptools/issues/13137)
+* Fix symlink-related regression bugs. [#13214](https://github.com/microsoft/vscode-cpptools/issues/13214), [#13228](https://github.com/microsoft/vscode-cpptools/issues/13228)
+* Fix a regression bug when using 'Select IntelliSense Configuration'. [#13220](https://github.com/microsoft/vscode-cpptools/issues/13220)
+* Fix a regression bug with `files.associations` handling. [#13223](https://github.com/microsoft/vscode-cpptools/issues/13223)
+
 ## Version 1.23.5: January 28, 2025
 ### Enhancements
 * Modifications to the snippet completions to more closely match the snippets provided by TypeScript. [#4482](https://github.com/microsoft/vscode-cpptools/issues/4482)

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.23.5-main",
+    "version": "1.23.6-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",

diff --git a/Extension/src/LanguageServer/client.ts b/Extension/src/LanguageServer/client.ts
@@ -1134,10 +1134,9 @@ export class DefaultClient implements Client {
                     return ui.ShowConfigureIntelliSenseButton(false, this, ConfigurationType.CompileCommands, showButtonSender);
                 } else {
                     action = "select compiler";
-                    const newCompiler: string = util.isCl(paths[index]) ? "cl.exe" : paths[index];
-
+                    let newCompiler: string = util.isCl(paths[index]) ? "cl.exe" : paths[index];
+                    newCompiler = newCompiler.replace(/[\\/]/g, preferredPathSeparator);
                     settings.defaultCompilerPath = newCompiler;
-                    settings.defaultCompilerPath = settings.defaultCompilerPath.replace(/[\\/]/g, preferredPathSeparator);
                     await this.configuration.updateCompilerPathIfSet(newCompiler);
                     void SessionState.trustedCompilerFound.set(true);
                 }

diff --git a/Extension/src/common.ts b/Extension/src/common.ts
@@ -1450,7 +1450,7 @@ export function findPowerShell(): string | undefined {
                     return name;
                 }
             } catch (e) {
-                return undefined;
+                // ignore, try next candidate
             }
         }
     }