Просмотр исходного кода

Fix wix installer not using the right path

Daniel Chalmers 9 месяцев назад
Родитель
Сommit
80b8dd3898
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      .github/actions/prepare-for-release/action.yml
  2. 1 1
      Product.wxs

+ 1 - 1
.github/actions/prepare-for-release/action.yml

@@ -29,7 +29,7 @@ runs:
         dotnet tool install --global wix --version 4.0.6
         dotnet tool install --global wix --version 4.0.6
         for rid in ${{ inputs.rids }}; do
         for rid in ${{ inputs.rids }}; do
           dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/$rid" -c Release -r $rid -p:Version=${{ inputs.version }}
           dotnet publish ./DesktopClock/DesktopClock.csproj -o "publish/$rid" -c Release -r $rid -p:Version=${{ inputs.version }}
-          wix build Product.wxs -o "publish/$rid/Install DesktopClock ${{ inputs.version }} ${rid}.msi"
+          wix build Product.wxs -dMainExeSource="publish/$rid/DesktopClock.exe" -o "publish/$rid/Install DesktopClock ${{ inputs.version }} ${rid}.msi"
         done
         done
 
 
     - uses: actions/upload-artifact@v4
     - uses: actions/upload-artifact@v4

+ 1 - 1
Product.wxs

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