From c522e299a21f6a8ed904a9c6b8e74bd2b438f90d Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Wed, 23 Nov 2022 08:03:01 -0500
Subject: [PATCH 1/5] Build an Installer

---
 .github/workflows/build.yml |  5 +++++
 src/installer.wxs           | 40 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/installer.wxs

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 25610d7..127282c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,6 +18,11 @@ jobs:
     - name: Build
       shell: cmd
       run: src/make_release.cmd
+    - name: Installer
+      run: |
+        cd src/etl2pcapng
+        & 'C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe' ../installer.wxs -o etl2pcapng.wixobj
+        & 'C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe' -b ./ -o etl2pcapng.msi etl2pcapng.wixobj
     - uses: actions/upload-artifact@v2
       with:
         name: bin
diff --git a/src/installer.wxs b/src/installer.wxs
new file mode 100644
index 0000000..35f70fc
--- /dev/null
+++ b/src/installer.wxs
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="*"
+           Language="1033"
+           Manufacturer="Microsoft"
+           Name="etl2pcapng"
+           UpgradeCode="04112892-be8f-483a-9ce4-61630c8c2600"
+           Version="1.10.0">
+    <Package InstallScope="perUser" Compressed="yes" />
+    <MajorUpgrade DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
+    <MediaTemplate EmbedCab="yes" />
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="LocalAppDataFolder">
+        <Directory Id="COMPANYFOLDER" Name="Microsoft">
+          <Directory Id="INSTALLFOLDER" Name="etl2pcapng">
+            <Component Id="ProductComponent" Guid='f1ed5446-aeb7-493e-94cb-1bd6522bcc83'>
+              <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]'
+                             Name='InstallFolder'
+                             Value='[INSTALLFOLDER]'
+                             Type='string'
+                             KeyPath='yes' />
+              <File Source="etl2pcapng.exe" />
+              <RemoveFolder Id="COMPANYFOLDER" Directory='COMPANYFOLDER' On="uninstall"/>
+              <RemoveFolder Id="INSTALLFOLDER" On="uninstall"/>
+            </Component>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+    <DirectoryRef Id="TARGETDIR">
+      <Component Id="PathEnvUsr" Guid="d1b1d423-ffc1-41b9-985c-5f9895e8ad21">
+        <Environment Id="EnvPathUsr" Name="PATH" Action="set" Part="last" System="no" Value="[INSTALLFOLDER]" Permanent="no"/>
+      </Component>
+    </DirectoryRef>
+    <Feature Id="etl2pcapng">
+      <ComponentRef Id="ProductComponent" />
+      <ComponentRef Id='PathEnvUsr' />
+    </Feature>
+  </Product>
+</Wix>

From 4db7d38b2e7936a6cdb13e2ed6da88efcf4c60f5 Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Wed, 23 Nov 2022 08:12:49 -0500
Subject: [PATCH 2/5] Putin make release

---
 .github/workflows/build.yml | 5 -----
 src/make_release.cmd        | 3 +++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 127282c..25610d7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,11 +18,6 @@ jobs:
     - name: Build
       shell: cmd
       run: src/make_release.cmd
-    - name: Installer
-      run: |
-        cd src/etl2pcapng
-        & 'C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe' ../installer.wxs -o etl2pcapng.wixobj
-        & 'C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe' -b ./ -o etl2pcapng.msi etl2pcapng.wixobj
     - uses: actions/upload-artifact@v2
       with:
         name: bin
diff --git a/src/make_release.cmd b/src/make_release.cmd
index b1096f8..651d11d 100644
--- a/src/make_release.cmd
+++ b/src/make_release.cmd
@@ -24,6 +24,9 @@ copy build_release\x64\Release\etl2pcapng.pdb etl2pcapng\x64
 copy build_release\x86\Release\etl2pcapng.exe etl2pcapng\x86
 copy build_release\x86\Release\etl2pcapng.pdb etl2pcapng\x86
 
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" installer.wxs -o etl2pcapng\x64\etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b etl2pcapng\x64 -o etl2pcapng.msi etl2pcapng\x64\etl2pcapng.wixobj
+
 if exist etl2pcapng.zip del etl2pcapng.zip
 echo Now zip up etl2pcapng directory and upload to github.
 

From f9c127343779c2e692bec9639281d4768dd1c42b Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Wed, 23 Nov 2022 08:17:31 -0500
Subject: [PATCH 3/5] Fix output path

---
 src/make_release.cmd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/make_release.cmd b/src/make_release.cmd
index 651d11d..108bcfa 100644
--- a/src/make_release.cmd
+++ b/src/make_release.cmd
@@ -25,7 +25,7 @@ copy build_release\x86\Release\etl2pcapng.exe etl2pcapng\x86
 copy build_release\x86\Release\etl2pcapng.pdb etl2pcapng\x86
 
 "C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" installer.wxs -o etl2pcapng\x64\etl2pcapng.wixobj
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b etl2pcapng\x64 -o etl2pcapng.msi etl2pcapng\x64\etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b etl2pcapng\x64 -o etl2pcapng\x64\etl2pcapng.msi etl2pcapng\x64\etl2pcapng.wixobj
 
 if exist etl2pcapng.zip del etl2pcapng.zip
 echo Now zip up etl2pcapng directory and upload to github.

From f0153c8e7c0e7906a8094872ff1c148ae66ce12b Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Wed, 23 Nov 2022 08:22:04 -0500
Subject: [PATCH 4/5] Move things around and only publish .msi

---
 src/make_release.cmd | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/make_release.cmd b/src/make_release.cmd
index 108bcfa..7be9890 100644
--- a/src/make_release.cmd
+++ b/src/make_release.cmd
@@ -10,6 +10,8 @@ mkdir build_release\x86
 cd build_release\x64
 cmake -A x64 ../..
 cmake --build . --config Release
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" ..\..\installer.wxs -o etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b .\ -o etl2pcapng.msi etl2pcapng.wixobj
 cd ..\x86
 cmake -A Win32 ../..
 cmake --build . --config Release
@@ -21,12 +23,10 @@ mkdir etl2pcapng\x64
 mkdir etl2pcapng\x86
 copy build_release\x64\Release\etl2pcapng.exe etl2pcapng\x64
 copy build_release\x64\Release\etl2pcapng.pdb etl2pcapng\x64
+copy build_release\x64\Release\etl2pcapng.msi etl2pcapng\x64
 copy build_release\x86\Release\etl2pcapng.exe etl2pcapng\x86
 copy build_release\x86\Release\etl2pcapng.pdb etl2pcapng\x86
 
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" installer.wxs -o etl2pcapng\x64\etl2pcapng.wixobj
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b etl2pcapng\x64 -o etl2pcapng\x64\etl2pcapng.msi etl2pcapng\x64\etl2pcapng.wixobj
-
 if exist etl2pcapng.zip del etl2pcapng.zip
 echo Now zip up etl2pcapng directory and upload to github.
 

From 15f1cc6dfe812bd62fcabf97e9a70fd2de301fd4 Mon Sep 17 00:00:00 2001
From: Nick Banks <nibanks@microsoft.com>
Date: Wed, 23 Nov 2022 08:27:57 -0500
Subject: [PATCH 5/5] One more try

---
 src/make_release.cmd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/make_release.cmd b/src/make_release.cmd
index 7be9890..457f057 100644
--- a/src/make_release.cmd
+++ b/src/make_release.cmd
@@ -10,8 +10,8 @@ mkdir build_release\x86
 cd build_release\x64
 cmake -A x64 ../..
 cmake --build . --config Release
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" ..\..\installer.wxs -o etl2pcapng.wixobj
-"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b .\ -o etl2pcapng.msi etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/candle.exe" ..\..\installer.wxs -o Release\etl2pcapng.wixobj
+"C:/Program Files (x86)/WiX Toolset v3.11/bin/light.exe" -b Release -o Release\etl2pcapng.msi Release\etl2pcapng.wixobj
 cd ..\x86
 cmake -A Win32 ../..
 cmake --build . --config Release