From 8f4bd9a3a6e9f1ee43df591691667d7e708bd784 Mon Sep 17 00:00:00 2001
From: AutumnNazi <104422820+AutumnNazi@users.noreply.github.com>
Date: Thu, 16 Jul 2026 14:38:20 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(installer):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20MSI=20=E6=9B=B4=E6=96=B0=E5=90=8E=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=9B=BE=E6=A0=87=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 让开始菜单和桌面快捷方式直接使用 GoNavi.exe 内嵌图标
- 避免 Major Upgrade 后 Shell 缓存继续引用已删除的 MSI 图标资源
- 增加 Windows 安装产物回归测试，锁定快捷方式图标来源
---
 build/windows/installer.wxs             |  4 ++--
 tools/windows-release-artifacts.test.py | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/build/windows/installer.wxs b/build/windows/installer.wxs
index e7988b48..1f1aa3a5 100644
--- a/build/windows/installer.wxs
+++ b/build/windows/installer.wxs
@@ -31,17 +31,17 @@
             Source="$(var.SourceExe)"
             Name="GoNavi.exe"
             KeyPath="yes">
+        <!-- Keep shortcut icons bound to the stable executable path. Referencing the MSI Icon table
+             can leave Windows shell caches pointing at the removed product cache after a major upgrade. -->
         <Shortcut Id="StartMenuShortcut"
                   Directory="ProgramMenuFolder"
                   Name="$(var.ProductName)"
                   WorkingDirectory="INSTALLFOLDER"
-                  Icon="GoNaviIcon"
                   Advertise="no" />
         <Shortcut Id="DesktopShortcut"
                   Directory="DesktopFolder"
                   Name="$(var.ProductName)"
                   WorkingDirectory="INSTALLFOLDER"
-                  Icon="GoNaviIcon"
                   Advertise="no" />
       </File>
       <File Id="GoNaviMsiInstallMarker"
diff --git a/tools/windows-release-artifacts.test.py b/tools/windows-release-artifacts.test.py
index 0938bdc0..9df4a4e3 100644
--- a/tools/windows-release-artifacts.test.py
+++ b/tools/windows-release-artifacts.test.py
@@ -72,8 +72,17 @@ class WindowsReleaseArtifactsTest(unittest.TestCase):
         self.assertIsNotNone(package.find("wix:MediaTemplate", ns))
         self.assertIsNotNone(package.find("wix:Property[@Id='ARPPRODUCTICON']", ns))
         self.assertIsNotNone(package.find("wix:SetProperty[@Id='ARPINSTALLLOCATION']", ns))
-        self.assertIsNotNone(package.find(".//wix:Shortcut[@Id='StartMenuShortcut']", ns))
-        self.assertIsNotNone(package.find(".//wix:Shortcut[@Id='DesktopShortcut']", ns))
+        executable = package.find(".//wix:File[@Id='GoNaviExe']", ns)
+        self.assertIsNotNone(executable)
+        assert executable is not None
+        start_menu_shortcut = executable.find("wix:Shortcut[@Id='StartMenuShortcut']", ns)
+        self.assertIsNotNone(start_menu_shortcut)
+        assert start_menu_shortcut is not None
+        self.assertNotIn("Icon", start_menu_shortcut.attrib)
+        desktop_shortcut = executable.find("wix:Shortcut[@Id='DesktopShortcut']", ns)
+        self.assertIsNotNone(desktop_shortcut)
+        assert desktop_shortcut is not None
+        self.assertNotIn("Icon", desktop_shortcut.attrib)
         marker = package.find(".//wix:RegistryValue[@Name='InstallType']", ns)
         self.assertIsNotNone(marker)
         assert marker is not None