From 73446bd992fa0770d279c76e381ce69041e98e8f Mon Sep 17 00:00:00 2001
From: ZelinWang <zelinwang@microsoft.com>
Date: Mon, 19 Jan 2026 16:21:19 +0800
Subject: [PATCH 1/2] {Packaging} Optimize MSI upgrade performance with
 REINSTALLMODE=amus

---
 build_scripts/windows/Product.wxs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build_scripts/windows/Product.wxs b/build_scripts/windows/Product.wxs
index 1d14b411d78..a19e344f4d7 100644
--- a/build_scripts/windows/Product.wxs
+++ b/build_scripts/windows/Product.wxs
@@ -49,7 +49,10 @@
       <UpgradeVersion Property="WIX_DOWNGRADE_DETECTED" Minimum="$(var.ProductVersion)" IncludeMinimum="no" OnlyDetect="yes" />
     </Upgrade>
     <InstallExecuteSequence>
-      <RemoveExistingProducts After="InstallExecute" />
+      <!-- RemoveExistingProducts runs BEFORE InstallInitialize to completely remove old version first.
+           This prevents DLL conflicts when upgrading across Python versions (e.g., 3.12 to 3.13).
+           See: https://github.com/Azure/azure-cli/issues/32045 -->
+      <RemoveExistingProducts Before="InstallInitialize" />
     </InstallExecuteSequence>
 
     <!-- New product architectures should upgrade the original x86 product - even of the same version. -->
@@ -74,6 +77,13 @@
     <Property Id="MSIFASTINSTALL" Value="7" />
     <Property Id="ApplicationFolderName" Value="Microsoft SDKs\Azure" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
+    
+    <!-- Force reinstall of all files during upgrade to handle cross-Python-version upgrades.
+         'a' = Force reinstall of all files regardless of version
+         This is necessary because pywin32's .pyd files have version numbers like 3.11.xxx or 3.13.xxx,
+         and MSI's version comparison may incorrectly determine that older Python version files are "newer".
+         See: https://github.com/Azure/azure-cli/issues/32045 -->
+    <SetProperty Id="REINSTALLMODE" Value="amus" Before="CostFinalize" Sequence="both">WIX_UPGRADE_DETECTED</SetProperty>
 
     <Feature Id="ProductFeature"
              Title="Microsoft Azure CLI"

From 3f321d4f8ff873e546a3a6cca6ed0238ce0da182 Mon Sep 17 00:00:00 2001
From: ZelinWang <zelinwang@microsoft.com>
Date: Wed, 21 Jan 2026 11:02:45 +0800
Subject: [PATCH 2/2] update

---
 build_scripts/windows/Product.wxs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/build_scripts/windows/Product.wxs b/build_scripts/windows/Product.wxs
index a19e344f4d7..c4d7fe2ebeb 100644
--- a/build_scripts/windows/Product.wxs
+++ b/build_scripts/windows/Product.wxs
@@ -49,9 +49,7 @@
       <UpgradeVersion Property="WIX_DOWNGRADE_DETECTED" Minimum="$(var.ProductVersion)" IncludeMinimum="no" OnlyDetect="yes" />
     </Upgrade>
     <InstallExecuteSequence>
-      <!-- RemoveExistingProducts runs BEFORE InstallInitialize to completely remove old version first.
-           This prevents DLL conflicts when upgrading across Python versions (e.g., 3.12 to 3.13).
-           See: https://github.com/Azure/azure-cli/issues/32045 -->
+      <!-- RemoveExistingProducts runs BEFORE InstallInitialize to completely remove old version first. -->
       <RemoveExistingProducts Before="InstallInitialize" />
     </InstallExecuteSequence>
 
@@ -78,11 +76,7 @@
     <Property Id="ApplicationFolderName" Value="Microsoft SDKs\Azure" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
     
-    <!-- Force reinstall of all files during upgrade to handle cross-Python-version upgrades.
-         'a' = Force reinstall of all files regardless of version
-         This is necessary because pywin32's .pyd files have version numbers like 3.11.xxx or 3.13.xxx,
-         and MSI's version comparison may incorrectly determine that older Python version files are "newer".
-         See: https://github.com/Azure/azure-cli/issues/32045 -->
+    <!-- Force reinstall of all files during upgrade -->
     <SetProperty Id="REINSTALLMODE" Value="amus" Before="CostFinalize" Sequence="both">WIX_UPGRADE_DETECTED</SetProperty>
 
     <Feature Id="ProductFeature"