From 1ad2575b8d70f3d2cf9084d2b4f5b7cfa4f0e20b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 18 Dec 2025 17:46:15 +0000
Subject: [PATCH 1/2] Initial plan


From dd98029a441036a929f15b365d9c1b8b6cb1ce92 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 18 Dec 2025 17:50:34 +0000
Subject: [PATCH 2/2] Create changelog for 1.22.5 release

Co-authored-by: JeffreyCA <9157833+JeffreyCA@users.noreply.github.com>
---
 cli/azd/CHANGELOG.md | 9 +++------
 cli/version.txt      | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/cli/azd/CHANGELOG.md b/cli/azd/CHANGELOG.md
index 021644785ff..523cd28528a 100644
--- a/cli/azd/CHANGELOG.md
+++ b/cli/azd/CHANGELOG.md
@@ -1,14 +1,11 @@
 # Release History
 
-## 1.23.0-beta.1 (Unreleased)
-
-### Features Added
-
-### Breaking Changes
+## 1.22.5 (2025-12-18)
 
 ### Bugs Fixed
 
-### Other Changes
+- [[#6398]](https://github.com/Azure/azure-dev/pull/6398) Fix `azd provision --preview` incorrectly prompting to install extensions for custom service targets when the extension is already installed.
+- [[#6408]](https://github.com/Azure/azure-dev/pull/6408) Fix panic during provisioning by reverting custom configuration properties feature introduced in v1.22.4.
 
 ## 1.22.4 (2025-12-17)
 
diff --git a/cli/version.txt b/cli/version.txt
index 14ff34b1875..da9594fd66f 100644
--- a/cli/version.txt
+++ b/cli/version.txt
@@ -1 +1 @@
-1.23.0-beta.1
+1.22.5