Merge branch 'main' into develop

SHA256.md

@@ -8,24 +8,24 @@ make sure that their SHA values match the values in the list below.
    following the instructions at
    https://code.visualstudio.com/docs/editor/extension-gallery#_common-questions.
    For example, download,
-   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/60.0.0/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
+   https://salesforce.gallery.vsassets.io/_apis/public/gallery/publisher/salesforce/extension/salesforcedx-vscode-core/60.1.2/assetbyname/Microsoft.VisualStudio.Services.VSIXPackage.
 
 2. From a terminal, run:
 
 shasum -a 256 <location_of_the_downloaded_file>
 
 3. Confirm that the SHA in your output matches the value in this list of SHAs.
 
-782cf50f3f7ab22f30aa6e886800b68cce80d9ebc5adfdbbe8a24978be6b8aad  salesforcedx-vscode-60.0.0.vsix
-d412d1aa82a361b8dc30b732987aa77377afbb439038ab2cd6c9bb05dd1c4c32  salesforcedx-vscode-apex-60.0.0.vsix
-4ce05c6a93c3df6327d1c8d12432fdc35d19922861f7b15365c465711c2363c7  salesforcedx-vscode-apex-debugger-60.0.0.vsix
-061d9b32e6725d9f229f1f218117487313c1298fe48831655d55a599c4458952  salesforcedx-vscode-apex-replay-debugger-60.0.0.vsix
-2d49b1bde008ae8c756557dee2cff68b67c85486638117509855f6a1decff27f  salesforcedx-vscode-core-60.0.0.vsix
-2d91a15e2364a42c0ceff3023166725f0eda74e7cc861816ec514b83975c3cc2  salesforcedx-vscode-expanded-60.0.0.vsix
-c167f7dbdc9ae68d7817f8013ac389f66dd1ff87f48193d40f2144bdc6f0218b  salesforcedx-vscode-lightning-60.0.0.vsix
-b3bc1661a48134592db6047e6af1fdbf1c31a41d617df88ed1d26d8c034c0eef  salesforcedx-vscode-lwc-60.0.0.vsix
-695f7c2d771aff28cfb27d0a49f069ae4818dc275187ce732f494022c724b751  salesforcedx-vscode-soql-60.0.0.vsix
-bd0f2c6c3951616b12ac38843171e3357db61e1c91f94f600bf17a8ce7fdbfd4  salesforcedx-vscode-visualforce-60.0.0.vsix
+e30c7e7772ca3ded5b9875b74c4c934d105696f2fd012acf9471929a0c229f7f  salesforcedx-vscode-60.1.2.vsix
+b0ca1ac8bd240f999c5b2f1907c5de77b4724028b53c47541a600370551aae15  salesforcedx-vscode-apex-60.1.2.vsix
+1501357cd2805d2bd5a07a6cfe34179a2096cdb5001716e9591de9c9a5cbdccd  salesforcedx-vscode-apex-debugger-60.1.2.vsix
+907a9cec59ab8ab769e86a0a8ff0a9e402ead9a9fd9a6cf4eb125b8a1119337b  salesforcedx-vscode-apex-replay-debugger-60.1.2.vsix
+13b0642c0f2db2b1b80557dbe4d501e94f8261a93c9967ffc429607d96bc2386  salesforcedx-vscode-core-60.1.2.vsix
+da300656ccd9385e0f323460e3a534bd4a3726cd19a96442bf0118111df4df2d  salesforcedx-vscode-expanded-60.1.2.vsix
+6a037ee024d062f27fd67fd51cfd3674f6524753e1b03511cf76c3bc9d7d3cbd  salesforcedx-vscode-lightning-60.1.2.vsix
+d5d9f45432b87f74b91d4c26742e1472f179a1759decac233424fbf68ed99b23  salesforcedx-vscode-lwc-60.1.2.vsix
+382e4bdb72876601dda01616ccc5449c361d4f8fecd93a4ebb3d0e0237977dd1  salesforcedx-vscode-soql-60.1.2.vsix
+1811ec57497c30e04c74a9c9b7e3cb8710ef5c5a54c4428524f7e0b9b4459d94  salesforcedx-vscode-visualforce-60.1.2.vsix
 
 
 4. Change the filename extension for the file that you downloaded from .zip to

packages/salesforcedx-vscode/CHANGELOG.md

@@ -1,3 +1,21 @@
+# 60.1.2 - February 22, 2024
+
+## Fixed
+
+#### salesforcedx-vscode-apex
+- We made some changes under the hood. ([PR #5427](https://github.com/forcedotcom/salesforcedx-vscode/pull/5427), [PR #5442](https://github.com/forcedotcom/salesforcedx-vscode/pull/5442))
+
+#### salesforcedx-vscode-lwc
+- We made some changes under the hood. ([PR #5428](https://github.com/forcedotcom/salesforcedx-vscode/pull/5428))
+
+#### salesforcedx-vscode-core
+
+- We made some changes under the hood. ([PR #5424](https://github.com/forcedotcom/salesforcedx-vscode/pull/5424), [PR #5409](https://github.com/forcedotcom/salesforcedx-vscode/pull/5409), [PR #5418](https://github.com/forcedotcom/salesforcedx-vscode/pull/5418))
+
+- We fixed an issue where error messages thrown by push commands weren't showing up in the Output tab. ([PR #5441](https://github.com/forcedotcom/salesforcedx-vscode/pull/5441))
+
+- We fixed an uncaught error that occurs when the Cancel button is clicked to cancel a retrieve in progress. ([PR #5443](https://github.com/forcedotcom/salesforcedx-vscode/pull/5443))
+
 # 60.0.0 - February 14, 2024
 
 ## Added