From 5afc0904971c4ec77f40bbe236f5b3181ef7776f Mon Sep 17 00:00:00 2001
From: George Adams <georgeadams1995@gmail.com>
Date: Tue, 30 Apr 2024 17:50:47 +0100
Subject: [PATCH] remove PerUserOrMachine-Example

---
 .github/workflows/wix.yml | 2 ++
 wix/Main.wxs.template     | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/wix.yml b/.github/workflows/wix.yml
index bb5729c04..57eab6ae4 100644
--- a/.github/workflows/wix.yml
+++ b/.github/workflows/wix.yml
@@ -20,6 +20,8 @@ jobs:
         include:
         - jdk: 8
           ICEDTEA_WEB_VERSION: "icedtea-web-1.8.6"
+        - jdk: 11
+          arch: x86
 
     name: wix
     runs-on: windows-latest
diff --git a/wix/Main.wxs.template b/wix/Main.wxs.template
index 364c7ecf4..8edbda541 100644
--- a/wix/Main.wxs.template
+++ b/wix/Main.wxs.template
@@ -46,15 +46,10 @@
       </InstallUISequence>
     -->
 
-    <Property Id="ApplicationFolderName" Value="PerUserOrMachine-Example" />
     <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
     <WixVariable Id="WixUISupportPerUser" Value="1" />
     <WixVariable Id="WixUISupportPerMachine" Value="1" />
 
-    <CustomAction Id="CustomSetDefaultPerUserFolder" Property="CustomWixPerUserFolder"
-      Value="[LocalAppDataFolder]Programs\[ApplicationFolderName]" Execute="immediate" />
-    <CustomAction Id="CustomSetDefaultPerMachineFolder" Property="CustomWixPerMachineFolder"
-      Value="[ProgramFiles64Folder][ApplicationFolderName]" Execute="immediate" />
     <CustomAction Id="CustomSetPerUserFolder" Property="APPLICATIONFOLDER"
       Value="[CustomWixPerUserFolder]" Execute="immediate" />
     <CustomAction Id="CustomSetPerMachineFolder" Property="APPLICATIONFOLDER"