From 4b9d770030195d992b8d6d040cf003810cadfb63 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Thu, 19 Dec 2024 20:38:24 +0000
Subject: [PATCH] Update Windows installer templates for arm64: enhance XML
 structure, update product details, and adjust file references

---
 .../windows/app-amd64-template.wxs            | 77 ++++++++++++++-----
 .../windows/app-arm64-template.wxs            |  4 +-
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/InfrastructureAgent/windows/app-amd64-template.wxs b/InfrastructureAgent/windows/app-amd64-template.wxs
index 086d106389..29d5fd9130 100644
--- a/InfrastructureAgent/windows/app-amd64-template.wxs
+++ b/InfrastructureAgent/windows/app-amd64-template.wxs
@@ -1,24 +1,59 @@
-<?xml version="1.0"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="OneUptime Infrastructure Agent (amd64)" Language="1033" Version="version_placeholder" Manufacturer="HackerBay, Inc." UpgradeCode="4ea4efc3-2b63-4afd-b1a9-ab47e626b752">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
-    <MajorUpgrade DowngradeErrorMessage="A newer version of OneUptime Infrastructure Agent is already installed." />
-    <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
+<?xml version='1.0' encoding='windows-1252'?>
+<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
+    <Product
+        Name='OneUptime Infrastructure Agent (arm64)'
+        Id='ABCDDCBA-86C7-4D14-AEC0-86413A69ABDE'
+        UpgradeCode='ABCDDCBA-7349-453F-94F6-BCB5110BA8FD'
+        Language='1033'
+        Codepage='1252'
+        Version='version_placeholder'
+        Manufacturer='HackerBay, Inc.'>
 
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="INSTALLFOLDER" Name="OneUptimeAgent" />
-      </Directory>
-    </Directory>
+        <Package
+            Id='*'
+            Keywords='Installer'
+            Description="OneUptime Infrastructure Agent installer"
+            Comments=''
+            Manufacturer='HackerBay, Inc.'
+            InstallerVersion='200'
+            Languages='1033'
+            Compressed='yes'
+            SummaryCodepage='1252'
+        />
 
-    <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Id="MainExecutable" Guid="2fffc00b-249b-4425-9bbb-524689362a81">
-        <File Source="binary_placeholder" />
-      </Component>
-    </ComponentGroup>
+        <Media
+            Id='1'
+            Cabinet='Sample.cab'
+            EmbedCab='yes'
+            DiskPrompt="CD-ROM #1"
+        />
 
-    <Feature Id="ProductFeature" Title="OneUptime Infrastructure Agent (amd64)" Level="1">
-      <ComponentGroupRef Id="ProductComponents" />
-    </Feature>
-  </Product>
-</Wix>
+        <Property
+            Id='DiskPrompt'
+            Value="OneUptime Infrastructure Agent Installation [1]"
+        />
+
+        <Directory Id='TARGETDIR' Name='SourceDir'>
+            <Directory Id='ProgramFiles64Folder' Name='PFiles'>
+                <Directory Id='OneUptime Infrastructure Agent' Name='OneUptime Infrastructure Agent'>
+                    <Component
+                        Id='MainExecutable'
+                        Guid='ABCDDCBA-83F1-4F22-985B-FDB3C8ABD474'
+                    >
+                        <File
+                            Id='binary_placeholder'
+                            Name='binary_placeholder'
+                            DiskId='1'
+                            Source='binary_placeholder'
+                            KeyPath='yes'
+                        />
+                    </Component>
+                </Directory>
+            </Directory>
+        </Directory>
+
+        <Feature Id='Complete' Level='1'>
+            <ComponentRef Id='MainExecutable' />
+        </Feature>
+    </Product>
+</Wix>
\ No newline at end of file
diff --git a/InfrastructureAgent/windows/app-arm64-template.wxs b/InfrastructureAgent/windows/app-arm64-template.wxs
index c030013f75..9b34094815 100644
--- a/InfrastructureAgent/windows/app-arm64-template.wxs
+++ b/InfrastructureAgent/windows/app-arm64-template.wxs
@@ -42,9 +42,9 @@
                     >
                         <File
                             Id='binary_placeholder'
-                            Name='./dist/oneuptime_windows_arm64/oneuptime-infrastructure-agent.exe'
+                            Name='binary_placeholder'
                             DiskId='1'
-                            Source='./dist/oneuptime_windows_arm64/oneuptime-infrastructure-agent.exe'
+                            Source='binary_placeholder'
                             KeyPath='yes'
                         />
                     </Component>