From a445748630abb16c77ac5365e77f715704012138 Mon Sep 17 00:00:00 2001
From: Wojtek Naruniec <wojtek@naruniec.me>
Date: Wed, 11 Dec 2024 10:56:28 +0100
Subject: [PATCH] Fix normalized version suffix

---
 .buildkite/pipeline.yml |  2 ++
 fastlane/Fastfile       | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 7bd23e9bf..00ff67c20 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -147,6 +147,7 @@ steps:
       buildkite-agent artifact download "*.app.zip" .
       buildkite-agent artifact download "*.dmg" .
       buildkite-agent artifact download "*.exe" .
+      buildkite-agent artifact download "*.appx" .
       buildkite-agent artifact download "*.nupkg" .
       buildkite-agent artifact download "*\\RELEASES" .
 
@@ -248,6 +249,7 @@ steps:
       buildkite-agent artifact download "*.zip" .
       buildkite-agent artifact download "*.dmg" .
       buildkite-agent artifact download "*.exe" .
+      buildkite-agent artifact download "*.appx" .
       buildkite-agent artifact download "*.nupkg" .
       buildkite-agent artifact download "*\\RELEASES" .
 
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3595d123b..9321db84c 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -93,6 +93,7 @@ def distribute_builds(
   # If we are distributing a build without a tag, i.e. a development build, we also want to update the latest build reference for distribution.
   update_latest = release_tag.nil?
   suffix = release_tag.nil? ? commit_hash : release_tag
+  normalized_version = suffix.gsub(/^v|-.*/, '')
   filename_root = 'studio'
   bucket_folder = 'studio'
 
@@ -145,7 +146,20 @@ def distribute_builds(
       suffix: 'full',
       extension: 'nupkg',
       name: 'Windows Update'
-    }
+    },
+    windows_appx: {
+      binary_path: File.join(BUILDS_FOLDER, 'Studio-appx-signed', "Studio #{normalized_version}.0.appx"),
+      filename_core: 'win32',
+      extension: 'appx',
+      name: 'Windows (Appx)'
+    },
+    windows_appx_unsigned: {
+      binary_path: File.join(BUILDS_FOLDER, 'Studio-appx-unsigned', "Studio #{normalized_version}.0 unsigned.appx"),
+      filename_core: 'win32',
+      suffix: 'unsigned',
+      extension: 'appx',
+      name: 'Windows (Unsigned Appx)'
+    },
   }
 
   # Add computed fields