From 51bf0abba26df5a9737f10b8e48005299afba7a3 Mon Sep 17 00:00:00 2001
From: Hammed Abass <abasshammedola@gmail.com>
Date: Fri, 31 Jul 2026 04:51:31 +0200
Subject: [PATCH] fix(release): configure Store CLI before settings

---
 .github/workflows/release.yml            |  8 ++++----
 packaging/release/test-release-config.sh | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 38a60bf..e271de6 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -295,10 +295,6 @@ jobs:
           SELLER_ID: ${{ secrets.SELLER_ID }}
           MICROSOFT_STORE_PRODUCT_ID: ${{ vars.MICROSOFT_STORE_PRODUCT_ID }}
         run: |
-          msstore settings --enableTelemetry false
-          if ($LASTEXITCODE -ne 0) {
-            throw "Failed to disable Microsoft Store CLI telemetry"
-          }
           msstore reconfigure `
             --tenantId "$env:AZURE_AD_TENANT_ID" `
             --sellerId "$env:SELLER_ID" `
@@ -307,6 +303,10 @@ jobs:
           if ($LASTEXITCODE -ne 0) {
             throw "Microsoft Store authentication failed"
           }
+          msstore settings --enableTelemetry false
+          if ($LASTEXITCODE -ne 0) {
+            throw "Failed to disable Microsoft Store CLI telemetry"
+          }
           msstore apps get "$env:MICROSOFT_STORE_PRODUCT_ID"
           if ($LASTEXITCODE -ne 0) {
             throw "The Microsoft Store application is not accessible"
diff --git a/packaging/release/test-release-config.sh b/packaging/release/test-release-config.sh
index 45f99ca..82bd84a 100755
--- a/packaging/release/test-release-config.sh
+++ b/packaging/release/test-release-config.sh
@@ -25,6 +25,21 @@ grep -F 'run: make build-apple-dmg' \
 	exit 1
 }
 
+store_reconfigure_line="$(
+	awk '/msstore reconfigure/ {print NR; exit}' \
+		"$repo_root/.github/workflows/release.yml"
+)"
+store_settings_line="$(
+	awk '/msstore settings --enableTelemetry false/ {print NR; exit}' \
+		"$repo_root/.github/workflows/release.yml"
+)"
+[[ -n $store_reconfigure_line &&
+	-n $store_settings_line &&
+	$store_reconfigure_line -lt $store_settings_line ]] || {
+	printf 'Microsoft Store CLI credentials must be configured before changing settings\n' >&2
+	exit 1
+}
+
 signing_line="$(
 	awk '/sign-exported-app\.sh/ {print NR; exit}' \
 		"$repo_root/apple/scripts/build-dmg.sh"