From 3934ef89ea36e45f55ad63e9bd7720da1454c3b3 Mon Sep 17 00:00:00 2001 From: Bob Brown Date: Wed, 16 Aug 2023 16:46:17 -0700 Subject: [PATCH 1/2] Fix bug introduced by #11175 (#11329) --- Extension/src/Debugger/attachToProcess.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Extension/src/Debugger/attachToProcess.ts b/Extension/src/Debugger/attachToProcess.ts index 1a47131bb0..5fddbfc16b 100644 --- a/Extension/src/Debugger/attachToProcess.ts +++ b/Extension/src/Debugger/attachToProcess.ts @@ -133,8 +133,8 @@ export class RemoteAttachPicker { } return `${outerQuote}${shPrefix}sh -c ${innerQuote}uname && if [ ${parameterBegin}uname -o${parameterEnd} = ${escapedQuote}Toybox${escapedQuote} ] ; ` + - `then ${PsProcessParser.psToyboxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Darwin${escapedQuote} ] ; ` + - `then ${PsProcessParser.psLinuxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Linux${escapedQuote} ] ; ` + + `then ${PsProcessParser.psToyboxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Linux${escapedQuote} ] ; ` + + `then ${PsProcessParser.psLinuxCommand} ; elif [ ${parameterBegin}uname${parameterEnd} = ${escapedQuote}Darwin${escapedQuote} ] ; ` + `then ${PsProcessParser.psDarwinCommand}; fi${innerQuote}${outerQuote}`; } From c8a777622295ea913bdeefb0f6a50b2d20745fe4 Mon Sep 17 00:00:00 2001 From: Colen Garoutte-Carson <49173979+Colengms@users.noreply.github.com> Date: Wed, 16 Aug 2023 17:50:39 -0700 Subject: [PATCH 2/2] Update version and changelog for 1.17.3 (#11330) --- Extension/CHANGELOG.md | 4 ++++ Extension/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Extension/CHANGELOG.md b/Extension/CHANGELOG.md index d45ed4feca..0f12e69884 100644 --- a/Extension/CHANGELOG.md +++ b/Extension/CHANGELOG.md @@ -1,5 +1,9 @@ # C/C++ for Visual Studio Code Changelog +## Version 1.17.3: August 16, 2023 +### Bug Fix +* Fix a regression with attaching the debugger to processes on Linux and macOS. [#11328](https://github.com/microsoft/vscode-cpptools/issues/11328) + ## Version 1.17.2: August 14, 2023 ### Enhancements * Enable a subset of markdown to render in hover by default and a `C_Cpp.markdownInComments` setting. [#6020](https://github.com/microsoft/vscode-cpptools/issues/6020), [#10461](https://github.com/microsoft/vscode-cpptools/issues/10461) diff --git a/Extension/package.json b/Extension/package.json index 99fd0f77b8..d6ac517d22 100644 --- 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.17.2-main", + "version": "1.17.3-main", "publisher": "ms-vscode", "icon": "LanguageCCPP_color_128x.png", "readme": "README.md",