remove PerUserOrMachine-Example

adoptium · Apr 30, 2024 · 5afc090 · 5afc090
1 parent 6f6a569
commit 5afc090
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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"