From d2e770f93b7a53d8660a6402eb29d1ae1c35e767 Mon Sep 17 00:00:00 2001
From: Dongbo Wang <dongbow@microsoft.com>
Date: Wed, 2 Oct 2024 17:04:14 -0700
Subject: [PATCH] Prepare for the v2.3.6 servicing release

---
 PSReadLine/Changes.txt       | 10 ++++++++++
 PSReadLine/PSReadLine.csproj |  6 +++---
 PSReadLine/PSReadLine.psd1   |  2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/PSReadLine/Changes.txt b/PSReadLine/Changes.txt
index bc57bc1f..70d59ffb 100644
--- a/PSReadLine/Changes.txt
+++ b/PSReadLine/Changes.txt
@@ -1,3 +1,13 @@
+### [2.3.6] - 2024-10-02
+
+- 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
 
 - Add the release stage to the pipeline and exclude test folders from Component Governance (#3982)
diff --git a/PSReadLine/PSReadLine.csproj b/PSReadLine/PSReadLine.csproj
index 0e28e36e..81a620ba 100644
--- a/PSReadLine/PSReadLine.csproj
+++ b/PSReadLine/PSReadLine.csproj
@@ -5,9 +5,9 @@
     <RootNamespace>Microsoft.PowerShell.PSReadLine</RootNamespace>
     <AssemblyName>Microsoft.PowerShell.PSReadLine2</AssemblyName>
     <NoWarn>$(NoWarn);CA1416</NoWarn>
-    <AssemblyVersion>2.3.5.0</AssemblyVersion>
-    <FileVersion>2.3.5</FileVersion>
-    <InformationalVersion>2.3.5</InformationalVersion>
+    <AssemblyVersion>2.3.6.0</AssemblyVersion>
+    <FileVersion>2.3.6</FileVersion>
+    <InformationalVersion>2.3.6</InformationalVersion>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
diff --git a/PSReadLine/PSReadLine.psd1 b/PSReadLine/PSReadLine.psd1
index 40d1f22d..5805f9a0 100644
--- a/PSReadLine/PSReadLine.psd1
+++ b/PSReadLine/PSReadLine.psd1
@@ -1,7 +1,7 @@
 @{
 RootModule = 'PSReadLine.psm1'
 NestedModules = @("Microsoft.PowerShell.PSReadLine2.dll")
-ModuleVersion = '2.3.5'
+ModuleVersion = '2.3.6'
 GUID = '5714753b-2afd-4492-a5fd-01d9e2cff8b5'
 Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'