Merged PR 30587: Prepare for the v2.3.5 servicing release

Prepare for the v2.3.5 servicing release
PowerShell · Apr 2, 2024 · bd8fe99 · bd8fe99
1 parent 7256221
commit bd8fe99
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/MockPSConsole/MockPSConsole.csproj b/MockPSConsole/MockPSConsole.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.13" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" version="7.2.18" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PSReadLine.build.ps1 b/PSReadLine.build.ps1
@@ -160,7 +160,8 @@ task LayoutModule BuildPolyfiller, BuildMainModule, {
     $version = $versionInfo.FileVersion
     $semVer = $versionInfo.ProductVersion
 
-    if ($semVer -match "(.*)-(.*)") {
+    # dotnet build may add the Git commit hash to the 'ProductVersion' attribute with this format: +<commit-hash>.
+    if ($semVer -match "(.*)-([^\+]*)(?:\+.*)?") {
         # Make sure versions match
         if ($matches[1] -ne $version) { throw "AssemblyFileVersion mismatch with AssemblyInformationalVersion" }
         $prerelease = $matches[2]

diff --git a/PSReadLine/Changes.txt b/PSReadLine/Changes.txt
@@ -1,3 +1,13 @@
+### [2.3.5] - 2024-04-02
+
+- Add the release stage to the pipeline and exclude test folders from Component Governance (#3982)
+- Change back to 'external_distribution' for nupkg signing (#3977)
+- Migrate PSReadLine release build pipeline to OneBranch (#3975)
+- Fix the null-reference exception when running `Debug-Job` on a thread job (#3957)
+- Update build script to always include the `ProjectUri` info (#3821)
+
+[2.3.5]: https://github.com/PowerShell/PSReadLine/compare/v2.3.4...v2.3.5
+
 ### [2.3.4] - 2023-10-02
 
 - Choose the inline prediction color based on the environment (#3808)

diff --git 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.4.0</AssemblyVersion>
-    <FileVersion>2.3.4</FileVersion>
-    <InformationalVersion>2.3.4</InformationalVersion>
+    <AssemblyVersion>2.3.5.0</AssemblyVersion>
+    <FileVersion>2.3.5</FileVersion>
+    <InformationalVersion>2.3.5</InformationalVersion>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <TargetFrameworks>net462;net6.0</TargetFrameworks>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
@@ -22,7 +22,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Management.Automation" Version="7.2.13" />
+    <PackageReference Include="System.Management.Automation" Version="7.2.18" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/PSReadLine/PSReadLine.psd1 b/PSReadLine/PSReadLine.psd1
@@ -1,7 +1,7 @@
 @{
 RootModule = 'PSReadLine.psm1'
 NestedModules = @("Microsoft.PowerShell.PSReadLine2.dll")
-ModuleVersion = '2.3.4'
+ModuleVersion = '2.3.5'
 GUID = '5714753b-2afd-4492-a5fd-01d9e2cff8b5'
 Author = 'Microsoft Corporation'
 CompanyName = 'Microsoft Corporation'

diff --git a/Polyfill/Polyfill.csproj b/Polyfill/Polyfill.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="System.Management.Automation" Version="7.2.13" />
+    <PackageReference Include="System.Management.Automation" Version="7.2.18" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">

diff --git a/test/PSReadLine.Tests.csproj b/test/PSReadLine.Tests.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.13" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.18" />
   </ItemGroup>
 
   <ItemGroup>