From 4b70c5edcc66149e8f76e633570a00f97d540b23 Mon Sep 17 00:00:00 2001
From: ClementTsang <cjhtsang@uwaterloo.ca>
Date: Sun, 9 May 2021 20:05:02 -0400
Subject: [PATCH] github: update deployment process for winget files

---
 .github/workflows/deployment.yml              |  6 ++--
 .../windows/winget/winget.yaml.template       | 29 +++++++++++--------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index 3a51810d..91d396c1 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -264,7 +264,7 @@ jobs:
       - name: Build winget (Windows x86-64 MSVC)
         if: matrix.triple.target == 'x86_64-pc-windows-msvc'
         run: |
-          python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/windows/winget/winget.yaml.template" "${{ env.RELEASE_VERSION }}.yaml" "SHA256" "./bottom_x86_64_installer.msi"
+          python "./deployment/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/windows/winget/winget.yaml.template" "Clement.bottom.yaml" "SHA256" "./bottom_x86_64_installer.msi"
 
       - name: Upload winget file (Windows x86-64 MSVC)
         if: matrix.triple.target == 'x86_64-pc-windows-msvc'
@@ -273,8 +273,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ env.RELEASE_UPLOAD_URL }}
-          asset_path: ${{ env.RELEASE_VERSION }}.yaml
-          asset_name: ${{ env.RELEASE_VERSION }}.yaml
+          asset_path: Clement.bottom.yaml
+          asset_name: Clement.bottom.yaml
           asset_content_type: application/octet-stream
 
       - name: Build Debian release (Linux x86-64 GNU)
diff --git a/deployment/windows/winget/winget.yaml.template b/deployment/windows/winget/winget.yaml.template
index 383841c3..d577505a 100644
--- a/deployment/windows/winget/winget.yaml.template
+++ b/deployment/windows/winget/winget.yaml.template
@@ -1,16 +1,21 @@
-Id: Clement.bottom
-Version: $version
-Name: bottom
+PackageIdentifier: Clement.bottom
+PackageVersion: $version
+PackageName: bottom
 Publisher: Clement Tsang
 License: MIT License
 LicenseUrl: https://github.com/ClementTsang/bottom/blob/master/LICENSE
-AppMoniker: bottom
-Tags: tui, monitoring, terminal
-Description: Yet another cross-platform graphical process/system monitor. 
-Homepage: https://github.com/ClementTsang/bottom
+Moniker: bottom
+Tags:
+- tui
+- monitoring
+- terminal
+ShortDescription: Yet another cross-platform graphical process/system monitor.
+PackageUrl: https://github.com/ClementTsang/bottom
 Installers:
-  - Arch: x64
-    Url: https://github.com/ClementTsang/bottom/releases/download/$version/bottom_x86_64_installer.msi
-    Sha256: $hash1
-    InstallerType: msi
-    
\ No newline at end of file
+- Architecture: x64
+  InstallerUrl: https://github.com/ClementTsang/bottom/releases/download/$version/bottom_x86_64_installer.msi
+  InstallerSha256: $hash1
+  InstallerType: msi
+PackageLocale: en-US
+ManifestType: singleton
+ManifestVersion: 1.0.0
\ No newline at end of file