From 57da1d329df45c8d2efad8a85eb13fcefe7afff2 Mon Sep 17 00:00:00 2001
From: Justin Chung <124807742+jshigetomi@users.noreply.github.com>
Date: Mon, 8 Sep 2025 17:07:48 -0500
Subject: [PATCH 1/2] Cherry-pick PR #26011 with conflicts for manual
 resolution

---
 CHANGELOG/7.4.md | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG/7.4.md b/CHANGELOG/7.4.md
index cd1070c0653..52979aedb13 100644
--- a/CHANGELOG/7.4.md
+++ b/CHANGELOG/7.4.md
@@ -1,5 +1,37 @@
 # 7.4 Changelog
 
+## [7.4.12]
+
+### Tools
+
+- Add CodeQL suppressions (#25973)
+
+### Build and Packaging Improvements
+
+<details>
+
+<summary>
+
+<p>Update .NET SDK to 8.0.413</p>
+
+</summary>
+
+<ul>
+<li>Add LinuxHost Network configuration to PowerShell Packages pipeline (#26003)</li>
+<li>Update container images to use mcr.microsoft.com for Linux and Azure Linux (#25987)</li>
+<li>Update SDK to 8.0.413 (#25993)</li>
+<li>Make logical template name consistent between pipelines (#25992)</li>
+<li>Remove AsyncSDL from Pipelines Toggle Official/NonOfficial Runs (#25965)</li>
+</ul>
+
+</details>
+
+### Documentation and Help Content
+
+- Update third-party library versions to `8.0.19` for `ObjectPool`, Windows Compatibility, and `System.Drawing.Common` (#26001)
+
+[7.4.12]: https://github.com/PowerShell/PowerShell/compare/v7.4.11...v7.4.12
+
 ## [7.4.11] - 2025-06-17
 
 ### Engine Updates and Fixes
@@ -252,7 +284,7 @@ _This release is internal only. It is not available for download._
 <li>Add updated libicu dependency for Debian packages (#24301)</li>
 <li>Add mapping to azurelinux repo (#24290)</li>
 <li>Update vpack pipeline (#24281)</li>
-<li>Add <code>BaseUrl</code> to <code>buildinfo</code> json file (#24376)</li>
+<li>Add <code>BaseUrl</code> to <code>buildinfo</code> JSON file (#24376)</li>
 <li>Delete the msix blob if it's already there (#24353)</li>
 <li>Make some release tests run in a hosted pools (#24270)</li>
 <li>Create new pipeline for compliance (#24252)</li>
@@ -855,7 +887,7 @@ Bump .NET 8 to version 8.0.101
 <li>Bump StyleCop.Analyzers from 1.2.0-beta.406 to 1.2.0-beta.507 (#19837)</li>
 <li>Bump Microsoft.CodeAnalysis.CSharp from 4.6.0-1.final to 4.7.0-2.final (#19838)(#19667)</li>
 <li>Update to .NET 8 Preview 4 (#19696)</li>
-<li>Update experimental-feature json files (#19828)</li>
+<li>Update experimental-feature JSON files (#19828)</li>
 <li>Bump JsonSchema.Net from 4.1.1 to 4.1.5 (#19790)(#19768)(#19788)</li>
 <li>Update group to assign PRs in <code>fabricbot.json</code> (#19759)</li>
 <li>Add retry on failure for all upload tasks in Azure Pipelines (#19761)</li>
@@ -863,7 +895,7 @@ Bump .NET 8 to version 8.0.101
 <li>Delete symbols on Linux as well (#19735)</li>
 <li>Update <code>windows.json</code> packaging BOM (#19728)</li>
 <li>Disable SBOM signing for CI and add extra files for packaging tests (#19729)</li>
-<li>Update experimental-feature json files (#19698(#19588))</li>
+<li>Update experimental-feature JSON files (#19698(#19588))</li>
 <li>Add ProductCode in registry for MSI install (#19590)</li>
 <li>Runas format changed (#15434) (Thanks @krishnayalavarthi!)</li>
 <li>For Preview releases, add <code>pwsh-preview.exe</code> alias to MSIX package (#19602)</li>
@@ -1024,7 +1056,11 @@ Bump .NET 8 to version 8.0.101
 - Build the relative URI for links from the response in `Invoke-WebRequest` (#19092) (Thanks @CarloToso!)
 - Fix redirection for `-CustomMethod` `POST` in WebCmdlets (#19111) (Thanks @CarloToso!)
 - Dispose previous response in Webcmdlets (#19117) (Thanks @CarloToso!)
+<<<<<<< HEAD
 - Improve `Invoke-WebRequest` xml and json errors format (#18837) (Thanks @CarloToso!)
+=======
+- Improve `Invoke-WebRequest` XML and JSON errors format (#18837) (Thanks @CarloToso!)
+>>>>>>> f07949879 (Add 7.4.12 Changelog (#26011))
 - Fix error formatting to remove the unneeded leading newline for concise view (#19080)
 - Add `-NoHeader` parameter to `ConvertTo-Csv` and `Export-Csv` cmdlets (#19108) (Thanks @ArmaanMcleod!)
 - Fix `Start-Process -Credential -Wait` to work on Windows (#19082)

From cf57b807434a35908ae3529f958c2dbd7616e42e Mon Sep 17 00:00:00 2001
From: Travis Plunk <travis.plunk@microsoft.com>
Date: Mon, 8 Sep 2025 15:12:45 -0700
Subject: [PATCH 2/2] Fix merge conflict and update changelog for 7.4

---
 CHANGELOG/7.4.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/CHANGELOG/7.4.md b/CHANGELOG/7.4.md
index 52979aedb13..f2aee252a1f 100644
--- a/CHANGELOG/7.4.md
+++ b/CHANGELOG/7.4.md
@@ -1056,11 +1056,7 @@ Bump .NET 8 to version 8.0.101
 - Build the relative URI for links from the response in `Invoke-WebRequest` (#19092) (Thanks @CarloToso!)
 - Fix redirection for `-CustomMethod` `POST` in WebCmdlets (#19111) (Thanks @CarloToso!)
 - Dispose previous response in Webcmdlets (#19117) (Thanks @CarloToso!)
-<<<<<<< HEAD
-- Improve `Invoke-WebRequest` xml and json errors format (#18837) (Thanks @CarloToso!)
-=======
 - Improve `Invoke-WebRequest` XML and JSON errors format (#18837) (Thanks @CarloToso!)
->>>>>>> f07949879 (Add 7.4.12 Changelog (#26011))
 - Fix error formatting to remove the unneeded leading newline for concise view (#19080)
 - Add `-NoHeader` parameter to `ConvertTo-Csv` and `Export-Csv` cmdlets (#19108) (Thanks @ArmaanMcleod!)
 - Fix `Start-Process -Credential -Wait` to work on Windows (#19082)