From 11974f8fa45b6ad0c12d8871f165d482a4afefd6 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Thu, 3 Oct 2024 14:09:31 -0700
Subject: [PATCH] Merge the v2.3.6 changelog to GitHub (#4202)

---
 PSReadLine/Changes.txt | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/PSReadLine/Changes.txt b/PSReadLine/Changes.txt
index 2c4ce39f..35c73813 100644
--- a/PSReadLine/Changes.txt
+++ b/PSReadLine/Changes.txt
@@ -16,6 +16,18 @@
 
 [2.4.0-beta0]: https://github.com/PowerShell/PSReadLine/compare/v2.3.4...v2.4.0-beta0
 
+### [2.3.6] - 2024-10-02
+
+This is a servicing release that excludes SBOM files from the module.
+
+- Update the OneBranch pipeline to keep it compliant and remove SBOM files from module (#4201)
+- Make sure the `CodeQL` result from release pipeline gets uploaded (#4082)
+- Add 'ob_restore_phase' for every task before the signing task to work around the signing issue (#4046)
+- Change the NuGet feed to use the governed PowerShell feed (#4044)
+- Disable SBOM, signing, and codeQL for the publish job (#3986)
+
+[2.3.6]: https://github.com/PowerShell/PSReadLine/compare/v2.3.5...v2.3.6
+
 ### [2.3.5] - 2024-04-02
 
 This is a servicing release that excludes test components from SBOM generation.