Skip to content

Commit

Permalink
Upgrade installer to Wix v5
Browse files Browse the repository at this point in the history
  • Loading branch information
NotroDev committed Dec 7, 2024
1 parent b0a8338 commit 6732ee0
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 79 deletions.
14 changes: 6 additions & 8 deletions Installer/Folders.wxs
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)">
<Directory Id="LanguagesFolder" Name="Languages"/>
</Directory>
</StandardDirectory>
</Fragment>
</Wix>
<Fragment>
<StandardDirectory Id="ProgramFiles6432Folder">
<Directory Id="INSTALLFOLDER" Name="!(bind.Property.ProductName)" />
</StandardDirectory>
</Fragment>
</Wix>
34 changes: 0 additions & 34 deletions Installer/LanguagesComponents.wxs

This file was deleted.

45 changes: 21 additions & 24 deletions Installer/Package.wxs
Original file line number Diff line number Diff line change
@@ -1,34 +1,31 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="SkEditor" Manufacturer="Notro" Version="2.8.1" UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
<MajorUpgrade DowngradeErrorMessage="!(loc.DowngradeError)" />
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
<Package Name="SkEditor"
Manufacturer="Notro"
Version="2.8.2"
UpgradeCode="14564974-da58-4917-8a0d-590043f589c2">
<MediaTemplate EmbedCab="yes" />

<Feature Id="Main">
<ComponentGroupRef Id="SkEditorComponents" />
<ComponentGroupRef Id="LanguagesComponents" />
</Feature>

<ui:WixUI
Id="SkEditorInstaller_InstallDir"
InstallDirectory="INSTALLFOLDER"/>
Id="SkEditorInstaller_InstallDir"
InstallDirectory="INSTALLFOLDER" />

<UIRef Id="WixUI_ErrorProgressText" />

<WixVariable
Id="WixUIDialogBmp"
Value="Assets/background.png"/>

<WixVariable
Id="WixUIBannerBmp"
Value="Assets/top.png"/>

<WixVariable
Id="WixUIExclamationIco"
Value="Assets/Warning.ico"/>

<WixVariable
Id="WixUIInfoIco"
Value="Assets/Info.ico"/>
<WixVariable Id="WixUIDialogBmp"
Value="Assets/background.png" />

<WixVariable Id="WixUIBannerBmp"
Value="Assets/top.png" />

<WixVariable Id="WixUIExclamationIco"
Value="Assets/Warning.ico" />

<WixVariable Id="WixUIInfoIco"
Value="Assets/Info.ico" />
</Package>
</Wix>
</Wix>
15 changes: 5 additions & 10 deletions Installer/SkEditorComponents.wxs
Original file line number Diff line number Diff line change
@@ -1,23 +1,18 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<ComponentGroup Id="SkEditorComponents" Directory="INSTALLFOLDER">
<Files Include="..\SkEditor\bin\Release\publish\win\**">
<Exclude Files="..\SkEditor\bin\Release\publish\win\SkEditor.exe" />
</Files>

<Component>
<File Source="..\SkEditor\bin\Release\publish\win\SkEditor.exe"/>
<Shortcut Name="SkEditor" Directory="DesktopFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
<Shortcut Name="SkEditor" Directory="ProgramMenuFolder" Advertise="yes" Icon="SkEditorIcon.exe" />
</Component>
<Component>
<File Source="..\SkEditor\bin\Release\publish\win\av_libglesv2.dll" />
</Component>
<Component>
<File Source="..\SkEditor\bin\Release\publish\win\libHarfBuzzSharp.dll" />
</Component>
<Component>
<File Source="..\SkEditor\bin\Release\publish\win\libSkiaSharp.dll" />
</Component>
</ComponentGroup>

<Icon Id="SkEditorIcon.exe" SourceFile="Assets/SkEditor.ico"/>
<Property Id="ARPPRODUCTICON" Value="SkEditorIcon.exe" />
</Fragment>
</Wix>
</Wix>
6 changes: 3 additions & 3 deletions Installer/SkEditorInstaller.wixproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="WixToolset.Sdk/4.0.3">
<Project Sdk="WixToolset.Sdk/5.0.2">
<ItemGroup>
<Content Include="Assets\Info.ico" />
<Content Include="Assets\Warning.ico" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.6" />
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.3" />
<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
<PackageReference Include="WixToolset.UI.wixext" Version="5.0.2" />
</ItemGroup>
</Project>

0 comments on commit 6732ee0

Please sign in to comment.