Attempt to fix installer build from workflow

danielchalmers · Jan 3, 2025 · 713f396 · 713f396
1 parent 5f01fff
commit 713f396
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/.github/actions/prepare-for-release/action.yml b/.github/actions/prepare-for-release/action.yml
@@ -29,10 +29,7 @@ runs:
         dotnet tool install --global wix --version 4.0.6
         for rid in ${{ inputs.rids }}; do
           dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/$rid" -c Release -r $rid -p:Version=${{ inputs.version }}
-          (
-            cd "publish/$rid" &&
-            wix build Product.wxs -o "DesktopClock-${{ inputs.version }}-${rid}.msi"
-          )
+          wix build Product.wxs -d MainExeSource="publish/$rid/DesktopClock.exe" -o "publish/$rid/DesktopClock-${{ inputs.version }}-${rid}.msi"
         done
 
     - uses: actions/upload-artifact@v4

diff --git a/Product.wxs b/Product.wxs
@@ -48,7 +48,7 @@
   <Fragment>
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
       <Component Id="MainExe" Guid="2148738D-B1F4-48BD-8615-1617541C6BB3">
-        <File Id="MainExe" Name="$(var.Name).exe" Source="$(var.Name).exe" />
+        <File Id="MainExe" Name="$(var.Name).exe" Source="$(var.MainExeSource)" />
       </Component>
     </ComponentGroup>
   </Fragment>