From 26bb27adb3b0760f2e10ff0a00ff6388f4ca7e02 Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 23 Jul 2026 14:36:10 -0400
Subject: [PATCH 1/3] Move Setup file into Installer folder

---
 src/ServiceInsight.slnx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/ServiceInsight.slnx b/src/ServiceInsight.slnx
index 28761e47..7c332225 100644
--- a/src/ServiceInsight.slnx
+++ b/src/ServiceInsight.slnx
@@ -1,4 +1,7 @@
 <Solution>
+  <Folder Name="/Installer/">
+    <File Path="Setup/Setup.csproj" />
+  </Folder>
   <Folder Name="/Solution Items/">
     <File Path="Custom.Build.props" />
     <File Path="Setup/Setup.csproj" />

From 8b1549dd5f98552e7f1f977dbb8f86cb1f1695be Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 23 Jul 2026 14:40:00 -0400
Subject: [PATCH 2/3] Remove ServiceInsight reference from Setup project

---
 src/Setup/Setup.csproj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Setup/Setup.csproj b/src/Setup/Setup.csproj
index 498cf2e6..bdd802fc 100644
--- a/src/Setup/Setup.csproj
+++ b/src/Setup/Setup.csproj
@@ -12,10 +12,6 @@
     <TargetFramework>net48</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ServiceInsight\ServiceInsight.csproj" />
-  </ItemGroup>
-
   <Target Name="CreateInstaller" AfterTargets="Build">
     <PropertyGroup>
       <AdvancedInstallerPath>$(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Caphyon\Advanced Installer@Advanced Installer Path)</AdvancedInstallerPath>

From f2c05f69e00e2db71191d0585aaaab6fc81781aa Mon Sep 17 00:00:00 2001
From: Brandon Ording <bording@gmail.com>
Date: Thu, 23 Jul 2026 14:46:20 -0400
Subject: [PATCH 3/3] Use dotnet build to build Setup

---
 .github/workflows/release.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 08fcea35..7ac2d15b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Build Windows installer
         env:
           AZURE_KEY_VAULT_CLIENT_SECRET: ${{ secrets.AZURE_KEY_VAULT_CLIENT_SECRET }}
-        run: msbuild src/Setup -p:Configuration=Release -restore -m
+        run: dotnet build src/Setup --configuration Release
       - name: Publish artifacts
         uses: actions/upload-artifact@v7.0.1
         with: