Add agpl to installer and install extension in GH actions

This commit is contained in:
Christoph Stahl 2025-02-16 12:28:04 +01:00
parent dc7b2052ba
commit ebc8dd18f5
2 changed files with 9 additions and 1 deletions

View file

@ -94,10 +94,11 @@ jobs:
- name: Install WiX - name: Install WiX
run: | run: |
dotnet tool install --global wix dotnet tool install --global wix
dotnet add package WixToolset.UI.wixext wix extension add WixToolset.UI.wixext
- name: Copy wix file to dist - name: Copy wix file to dist
run: run:
Copy-Item -Verbose resources/windows/syng.wxs work/install/dist/syng.wxs Copy-Item -Verbose resources/windows/syng.wxs work/install/dist/syng.wxs
Copy-Item -Verbose resources/windows/agpl-3.0.rtf work/install/dist/agpl-3.0.rtf
- name: Build WiX on Windows - name: Build WiX on Windows
run: wix build -ext WixToolset.UI.wixext .\syng.wxs run: wix build -ext WixToolset.UI.wixext .\syng.wxs
working-directory: ./work/install/dist working-directory: ./work/install/dist

View file

@ -5,10 +5,12 @@
Name="Syng" Name="Syng"
Scope="perUserOrMachine" Scope="perUserOrMachine"
UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df" UpgradeCode="092e7e0b-5042-47a1-9673-544d9722f8df"
ProductCode="*"
Version="2.1.0"> Version="2.1.0">
<MediaTemplate EmbedCab="yes" /> <MediaTemplate EmbedCab="yes" />
<MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." /> <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
<ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" /> <ui:WixUI Id="WixUI_InstallDir" InstallDirectory="INSTALLFOLDER" />
<WixVariable Id="WixUILicenseRtf" Value="agpl-3.0.rtf" />
<Icon Id="syng.ico" SourceFile="..\syng.ico"/> <Icon Id="syng.ico" SourceFile="..\syng.ico"/>
<Property Id="ARPPRODUCTICON" Value="syng.ico" /> <Property Id="ARPPRODUCTICON" Value="syng.ico" />
<StandardDirectory Id="ProgramFilesFolder"> <StandardDirectory Id="ProgramFilesFolder">
@ -22,6 +24,11 @@
Icon="syng.ico" Icon="syng.ico"
IconIndex="0" IconIndex="0"
Advertise="yes" /> Advertise="yes" />
<Shortcut Id="UninstallProduct"
Name="Uninstall Syng"
Target="[SystemFolder]msiexec.exe"
Arguments="/x [ProductCode]"
Description="Uninstalls Syng" />
<Shortcut Id="desktopShortcut" <Shortcut Id="desktopShortcut"
Directory="DesktopFolder" Directory="DesktopFolder"
Name="syng" Name="syng"