From ce92cb381fe8b0c7a45edcce5f31310f86396d95 Mon Sep 17 00:00:00 2001
From: hustcer <hustcer@outlook.com>
Date: Wed, 7 May 2025 21:06:34 +0800
Subject: [PATCH] Fix Wix4UtilCA BinaryRef and README.txt

---
 .github/workflows/release-pkg.nu | 1 +
 wix/main.wixproj                 | 2 +-
 wix/main.wxs                     | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-pkg.nu b/.github/workflows/release-pkg.nu
index a869bbbb62..af9fa5747c 100755
--- a/.github/workflows/release-pkg.nu
+++ b/.github/workflows/release-pkg.nu
@@ -200,6 +200,7 @@ if $os in ['macos-latest'] or $USE_UBUNTU {
         cd $src; cd wix; hr-line; mkdir nu
         # Wix need the binaries be stored in nu folder
         cp -r ($'($dist)/*' | into glob) nu/
+        cp $'($dist)/README.txt' .
         ls -f nu/* | print
         let arch = if $nu.os-info.arch =~ 'x86_64' { 'x64' } else { 'arm64' }
         ./nu/nu.exe -c $'NU_RELEASE_VERSION=($version) dotnet build -c Release -p:Platform=($arch)'
diff --git a/wix/main.wixproj b/wix/main.wixproj
index f89c73b8a7..ccf018e0bd 100644
--- a/wix/main.wixproj
+++ b/wix/main.wixproj
@@ -4,7 +4,7 @@
     <OutputName>nu-$(Platform)</OutputName>
     <UpgradeCode>82D756D2-19FA-4F09-B10F-64942E89F364</UpgradeCode>
     <DefineConstants>
-      SourceDir=$(MSBuildProjectDirectory)\nu
+      SourceDir=$(MSBuildProjectDirectory)\nu;
     </DefineConstants>
     <SuppressValidation>true</SuppressValidation>
     <SuppressIces>ICE80</SuppressIces>
diff --git a/wix/main.wxs b/wix/main.wxs
index 257ee4c620..ee43ac4a1a 100644
--- a/wix/main.wxs
+++ b/wix/main.wxs
@@ -39,7 +39,7 @@
     <!-- <Property Id="MSIUSEREALADMINDETECTION" Value="1" /> -->
 
     <Property Id="ARPPRODUCTICON" Value="nu.ico" />
-    <Property Id='ARPHELPLINK' Value='https://www.nushell.sh/book/'/>
+    <Property Id='ARPHELPLINK' Value='https://www.nushell.sh/book/' />
     <Property Id="ApplicationFolderName" Value="$(var.ApplicationFolderName)" />
 
     <!-- Per Machine Install -->
@@ -224,11 +224,11 @@
                   Impersonate="yes"
                   Execute="deferred"
                   DllEntry="WixQuietExec"
-                  BinaryRef="Wix4UtilCA_X64" />
+                  BinaryRef="Wix4UtilCA_$(sys.BUILDARCHSHORT)" />
 
     <InstallExecuteSequence>
       <Custom Action="ReplacePathsInWindowsTerminalProfile" Before="InstallFinalize"
-              Condition="(&amp;WindowsTerminalProfile=3) OR ((!WindowsTerminalProfile=3) AND (REINSTALL&lt;&gt;&quot;&quot;))"/>
+              Condition="(&amp;WindowsTerminalProfile=3) OR ((!WindowsTerminalProfile=3) AND (REINSTALL&lt;&gt;&quot;&quot;))" />
     </InstallExecuteSequence>
   </Package>
 </Wix>