From 2aada2892d9ecda0e3c326bd4010584818760deb Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Mon, 3 Jul 2023 16:03:18 -0400
Subject: [PATCH] Cleanup winget manifests + Fix attempts

- Specify `burn` for `InstallerType` rather than `wix`.
- Check for .NET core runtime, since it is actually required. I think this is biting us in the ass for `winget` validation.
---
 .../Bundle.wxs                                         |  5 ++++-
 .../winget/manifest/Tgstation.Server.installer.yaml    | 10 +++++-----
 .../winget/manifest/Tgstation.Server.locale.en-US.yaml |  4 ++--
 build/package/winget/manifest/Tgstation.Server.yaml    |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs
index a6d7135340..62a558e1f1 100644
--- a/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs
+++ b/build/package/winget/Tgstation.Server.Host.Service.Wix.Bundle/Bundle.wxs
@@ -6,8 +6,11 @@
     
     <netfx:DotNetCoreSearch RuntimeType="aspnet" Platform="x64" MajorVersion="$(var.NetMajorVersion)" Variable="AspNetCorex64Status" />
     <netfx:DotNetCoreSearch RuntimeType="aspnet" Platform="x86" MajorVersion="$(var.NetMajorVersion)" Variable="AspNetCorex86Status" />
+    
+    <netfx:DotNetCoreSearch RuntimeType="core" Platform="x64" MajorVersion="$(var.NetMajorVersion)" Variable="NetCorex64Status" />
+    <netfx:DotNetCoreSearch RuntimeType="core" Platform="x86" MajorVersion="$(var.NetMajorVersion)" Variable="NetCorex86Status" />
 
-    <WixVariable Id="AspNetCoreDetectCondition" Value="AspNetCorex64Status OR AspNetCorex86Status" Overridable="yes" />
+    <WixVariable Id="AspNetCoreDetectCondition" Value="(NetCorex64Status AND AspNetCorex64Status) OR (NetCorex86Status AND AspNetCorex86Status)" />
 
     <Chain>
       <ExePackage PerMachine="yes" DetectCondition="!(wix.AspNetCoreDetectCondition)" Vital="yes" Permanent="yes" Protocol="burn" InstallArguments="/install /quiet /norestart /log [HOSTING_BUNDLE_LOG_PATH]" RepairArguments="/repair /quiet /norestart /log [HOSTING_BUNDLE_LOG_PATH]" UninstallArguments="/uninstall /quiet /norestart /log [HOSTING_BUNDLE_LOG_PATH]" Cache="remove" LogPathVariable="HOSTING_BUNDLE_LOG_PATH" RepairCondition="FALSE">
diff --git a/build/package/winget/manifest/Tgstation.Server.installer.yaml b/build/package/winget/manifest/Tgstation.Server.installer.yaml
index 4afd9144f6..89c60fcab2 100644
--- a/build/package/winget/manifest/Tgstation.Server.installer.yaml
+++ b/build/package/winget/manifest/Tgstation.Server.installer.yaml
@@ -2,14 +2,14 @@
 # yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.4.0.schema.json
 
 PackageIdentifier: Tgstation.Server
-PackageVersion: 0.22.475 # Set before publish by push_manifest.ps1
+PackageVersion: 0.22.475 # Do not change. Set before publish by push_manifest.ps1
 Installers:
-- InstallerUrl: https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v0.22.475/tgstation-server-installer.exe # Set before publish by push_manifest.ps1
+- InstallerUrl: https://github.com/tgstation/tgstation-server/releases/download/tgstation-server-v0.22.475/tgstation-server-installer.exe # Do not change. Set before publish by push_manifest.ps1
   InstallerLocale: en-US
   Architecture: x86
-  InstallerType: wix
+  InstallerType: burn
   Scope: machine
-  InstallerSha256: CF0D4D2FD042098D826A226A05A9DAA5C792318CF48FD334F7FC06AF6A8A23B1 # Set before publish by push_manifest.ps1
+  InstallerSha256: CF0D4D2FD042098D826A226A05A9DAA5C792318CF48FD334F7FC06AF6A8A23B1 # Do not change. Set before publish by push_manifest.ps1
   InstallModes:
   - interactive
   - silent
@@ -22,6 +22,6 @@ Installers:
   Dependencies:
     PackageDependencies:
     - PackageIdentifier: Microsoft.DotNet.AspNetCore.6
-  ReleaseDate: 2023-06-24
+  ReleaseDate: 2023-06-24 # Do not change. Set before publish by push_manifest.ps1
 ManifestType: installer
 ManifestVersion: 1.4.0
diff --git a/build/package/winget/manifest/Tgstation.Server.locale.en-US.yaml b/build/package/winget/manifest/Tgstation.Server.locale.en-US.yaml
index 67b00590d8..e4a446ca75 100644
--- a/build/package/winget/manifest/Tgstation.Server.locale.en-US.yaml
+++ b/build/package/winget/manifest/Tgstation.Server.locale.en-US.yaml
@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.4.0.schema.json
 
 PackageIdentifier: Tgstation.Server
-PackageVersion: 0.22.475 # Set before publish by push_manifest.ps1
+PackageVersion: 0.22.475 # Do not change. Set before publish by push_manifest.ps1
 PackageLocale: en-US
 Publisher: /tg/station 13
 PublisherUrl: https://github.com/tgstation/tgstation-server
@@ -14,7 +14,7 @@ ShortDescription: A production scale tool for BYOND server management
 Moniker: tgstation-server
 Documentations:
   - DocumentLabel: README.md
-    DocumentUrl: https://github.com/tgstation/tgstation-server/blob/tgstation-server-v0.22.475/README.md
+    DocumentUrl: https://github.com/tgstation/tgstation-server/blob/tgstation-server-v0.22.475/README.md # Do not change. Set before publish by push_manifest.ps1
 ReleaseNotesUrl: https://github.com/tgstation/tgstation-server/releases/tag/tgstation-server-v0.22.475
 PurchaseUrl: https://github.com/sponsors/Cyberboss
 ManifestType: defaultLocale
diff --git a/build/package/winget/manifest/Tgstation.Server.yaml b/build/package/winget/manifest/Tgstation.Server.yaml
index c23541ad90..7b7d3b8eba 100644
--- a/build/package/winget/manifest/Tgstation.Server.yaml
+++ b/build/package/winget/manifest/Tgstation.Server.yaml
@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.4.0.schema.json
 
 PackageIdentifier: Tgstation.Server
-PackageVersion: 0.22.475 # Set before publish by push_manifest.ps1
+PackageVersion: 0.22.475 # Do not change. Set before publish by push_manifest.ps1
 DefaultLocale: en-US
 ManifestType: version
 ManifestVersion: 1.4.0