From f1317ab987724d54888aa8570fb7079a48980cbc Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 25 Aug 2023 11:23:44 -0400
Subject: [PATCH] Fix winget package not deploying

- Provide .msi for `push_manifest.ps1`

Fixes #1640
---
 .github/workflows/ci-pipeline.yml      | 12 ++++++++++++
 build/package/winget/push_manifest.ps1 |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml
index 1a3148db03..f7ce8f0cfd 100644
--- a/.github/workflows/ci-pipeline.yml
+++ b/.github/workflows/ci-pipeline.yml
@@ -1508,6 +1508,12 @@ jobs:
         $tgsVersion = $versionXML.Project.PropertyGroup.TgsCoreVersion
         echo "TGS_VERSION=$tgsVersion" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
 
+    - name: Upload .msi
+      uses: actions/upload-artifact@v3
+      with:
+        name: packaging-windows-raw-msi
+        path: build/package/winget/Tgstation.Server.Host.Service.Wix/bin/x86/Release/en-US/tgstation-server.msi
+
     - name: Retrieve Server Service
       uses: actions/download-artifact@v3
       with:
@@ -1722,6 +1728,12 @@ jobs:
         $Env:TGS_HOST_NO_WEBPANEL=true
         dotnet build -c Release tools/Tgstation.Server.ReleaseNotes
 
+    - name: Retrieve Server Service
+      uses: actions/download-artifact@v3
+      with:
+        name: packaging-windows-raw-msi
+        path: artifacts
+
     - name: Execute Push Script
       shell: powershell
       run: build/package/winget/push_manifest.ps1
diff --git a/build/package/winget/push_manifest.ps1 b/build/package/winget/push_manifest.ps1
index 8e7b42d9bf..fefd65fe7a 100644
--- a/build/package/winget/push_manifest.ps1
+++ b/build/package/winget/push_manifest.ps1
@@ -15,6 +15,7 @@ try
 }
 
 $installerHash = Get-FileHash -Path "artifacts/tgstation-server-installer.exe" -ErrorAction Stop # SHA256 is the default
+$msiPath = [System.IO.Path]::Combine($pwd, "artifacts/tgstation-server.msi").Replace("/", "\");
 
 Push-Location build/package/winget
 try
@@ -24,7 +25,6 @@ try
     $devReleaseDate = '2023-06-24'
     $devProductCode = "{D24887FA-3228-4509-B5F3-4E07E349F278}"
 
-    $msiPath = [System.IO.Path]::Combine($pwd, "Tgstation.Server.Host.Service.Wix/bin/x86/Release/en-US/tgstation-server.msi").Replace("/", "\");
     Set-Location manifest
     Convert-Path -ErrorAction Stop -LiteralPath $msiPath
     $windowsInstaller = New-Object -ComObject WindowsInstaller.Installer