From 6732ee0b8fe4b1845379b8fa712bf1342e2ea4af Mon Sep 17 00:00:00 2001
From: NotroDev <notro.dev@gmail.com>
Date: Sat, 7 Dec 2024 11:53:36 +0100
Subject: [PATCH] Upgrade installer to Wix v5

---
 Installer/Folders.wxs               | 14 ++++-----
 Installer/LanguagesComponents.wxs   | 34 ----------------------
 Installer/Package.wxs               | 45 ++++++++++++++---------------
 Installer/SkEditorComponents.wxs    | 15 ++++------
 Installer/SkEditorInstaller.wixproj |  6 ++--
 5 files changed, 35 insertions(+), 79 deletions(-)
 delete mode 100644 Installer/LanguagesComponents.wxs

diff --git a/Installer/Folders.wxs b/Installer/Folders.wxs
index dc1f0f24..71509cf1 100644
--- a/Installer/Folders.wxs
+++ b/Installer/Folders.wxs
@@ -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>
\ No newline at end of file
diff --git a/Installer/LanguagesComponents.wxs b/Installer/LanguagesComponents.wxs
deleted file mode 100644
index b6becf6b..00000000
--- a/Installer/LanguagesComponents.wxs
+++ /dev/null
@@ -1,34 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-	<Fragment>
-		<ComponentGroup Id="LanguagesComponents" Directory="LanguagesFolder">
-			<Component>
-				<CreateFolder Directory="INSTALLFOLDER" Subdirectory="Languages"/>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\English.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Polish.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\French.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Russian.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\German.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Chinese.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Spanish.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Hungarian.xaml" />
-			</Component>
-			<Component>
-				<File Source="..\SkEditor\bin\Release\publish\win\Languages\Korean.xaml" />
-			</Component>
-		</ComponentGroup>
-	</Fragment>
-</Wix>
diff --git a/Installer/Package.wxs b/Installer/Package.wxs
index 89d3fe2f..f1d6719b 100644
--- a/Installer/Package.wxs
+++ b/Installer/Package.wxs
@@ -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>
\ No newline at end of file
diff --git a/Installer/SkEditorComponents.wxs b/Installer/SkEditorComponents.wxs
index 8c43e15e..f90d6318 100644
--- a/Installer/SkEditorComponents.wxs
+++ b/Installer/SkEditorComponents.wxs
@@ -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>
\ No newline at end of file
diff --git a/Installer/SkEditorInstaller.wixproj b/Installer/SkEditorInstaller.wixproj
index 1a983db0..491eea62 100644
--- a/Installer/SkEditorInstaller.wixproj
+++ b/Installer/SkEditorInstaller.wixproj
@@ -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>
\ No newline at end of file