From 2ad0ad2e1e9c2354a41dee0bfb599f62d7f18414 Mon Sep 17 00:00:00 2001
From: Claude <noreply@anthropic.com>
Date: Sun, 22 Mar 2026 02:45:23 +0000
Subject: [PATCH] fix: close running Desktop_Notes.exe before MSI upgrade to
 prevent duplicate instances

---
 .github/workflows/build.yml  | 2 +-
 .github/workflows/deploy.yml | 2 +-
 Product.wxs                  | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 41086fd..d45da52 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Create installer
         run: |
           dotnet tool install --global wix --version 4.0.5
-          wix build Product.wxs -o "./Desktop Notes/Desktop Notes/bin/Release/Desktop_Notes.msi"
+          wix build Product.wxs -ext WixToolset.Util.wixext -o "./Desktop Notes/Desktop Notes/bin/Release/Desktop_Notes.msi"
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6d9b841..1fa1879 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Create installer
         run: |
           dotnet tool install --global wix --version 4.0.5
-          wix build Product.wxs -o "./Desktop Notes/Desktop Notes/bin/Release/Desktop_Notes.msi"
+          wix build Product.wxs -ext WixToolset.Util.wixext -o "./Desktop Notes/Desktop Notes/bin/Release/Desktop_Notes.msi"
         
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
diff --git a/Product.wxs b/Product.wxs
index b569bb9..688d80c 100644
--- a/Product.wxs
+++ b/Product.wxs
@@ -2,7 +2,8 @@
 <?define Manufacturer = "Webarcx"?>
 <?define Guid = "E4D9B1E5-BE35-4CD8-8A81-983EDA7089B8"?>
 
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
+     xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
   <Package Name="$(var.Name)" Manufacturer="$(var.Manufacturer)" Version="!(bind.FileVersion.MainExe)" UpgradeCode="$(var.Guid)" Language="1033" InstallerVersion="500" Scope="perUser">
     <SummaryInformation Manufacturer="$(var.Manufacturer)" />
     <Icon Id="Logo.ico" SourceFile="Images\main.ico" />
@@ -21,6 +22,12 @@
     <StandardDirectory Id="ProgramMenuFolder">
       <Directory Id="ApplicationProgramsFolder" Name="$(var.Name)" />
     </StandardDirectory>
+    <util:CloseApplication
+      Id="CloseDesktopNotes"
+      Target="Desktop_Notes.exe"
+      CloseMessage="yes"
+      RebootPrompt="no"
+      TerminateProcess="5" />
     <MajorUpgrade
       DowngradeErrorMessage="不支持降级安装。请先卸载当前版本再安装旧版本。"
       Schedule="afterInstallInitialize"