From e0bb9533d49dc541fd747abc8c389107a82960c7 Mon Sep 17 00:00:00 2001
From: SoftFever <softfeverever@gmail.com>
Date: Thu, 11 Jun 2026 04:07:14 +0800
Subject: [PATCH] ci: run MSIX pack after existing Windows uploads and keep it
 out of release downloads

---
 .github/workflows/build_all.yml       |  2 ++
 .github/workflows/build_orca.yml      | 38 +++++++++++++--------------
 .github/workflows/publish_release.yml |  3 ++-
 3 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
index 79ffafa0f1..0788832d5c 100644
--- a/.github/workflows/build_all.yml
+++ b/.github/workflows/build_all.yml
@@ -14,6 +14,7 @@ on:
      - 'resources/**'
      - ".github/workflows/build_*.yml"
      - 'scripts/flatpak/**'
+     - 'scripts/msix/**'
 
   pull_request:
     branches:
@@ -30,6 +31,7 @@ on:
      - 'build_release_vs2022.bat'
      - 'build_release_macos.sh'
      - 'scripts/flatpak/**'
+     - 'scripts/msix/**'
 
 
   schedule:
diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml
index 1c3a96f7ab..a86a65868a 100644
--- a/.github/workflows/build_orca.yml
+++ b/.github/workflows/build_orca.yml
@@ -298,18 +298,6 @@ jobs:
         run: |
           cpack -G NSIS
 
-      - name: Build MSIX Store package Win
-        if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        working-directory: ${{ github.workspace }}
-        shell: pwsh
-        run: |
-          ./scripts/msix/build_msix.ps1 `
-            -InstallDir "${{ github.workspace }}/build/OrcaSlicer" `
-            -OutputPath "${{ github.workspace }}/build/OrcaSlicer_Windows_MSIX_${{ env.ver }}.msix" `
-            -IdentityName "${{ vars.ORCA_MSIX_IDENTITY_NAME || 'OrcaSlicer.Dev' }}" `
-            -Publisher "${{ vars.ORCA_MSIX_PUBLISHER || 'CN=00000000-0000-0000-0000-000000000000' }}" `
-            -PublisherDisplayName "${{ vars.ORCA_MSIX_PUBLISHER_DISPLAY_NAME || 'OrcaSlicer (dev)' }}"
-
       - name: Pack app
         if: runner.os == 'Windows'
         working-directory: ${{ github.workspace }}/build
@@ -336,13 +324,6 @@ jobs:
           name: OrcaSlicer_Windows_${{ env.ver }}
           path: ${{ github.workspace }}/build/OrcaSlicer*.exe
 
-      - name: Upload artifacts Win MSIX
-        if: runner.os == 'Windows' && !vars.SELF_HOSTED
-        uses: actions/upload-artifact@v7
-        with:
-          name: OrcaSlicer_Windows_MSIX_${{ env.ver }}
-          path: ${{ github.workspace }}/build/OrcaSlicer_Windows_MSIX_${{ env.ver }}.msix
-
       - name: Upload artifacts Win PDB
         if: runner.os == 'Windows' && !vars.SELF_HOSTED
         uses: actions/upload-artifact@v7
@@ -390,6 +371,25 @@ jobs:
           asset_content_type: application/x-msdownload
           max_releases: 1
 
+      - name: Build MSIX Store package Win
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        working-directory: ${{ github.workspace }}
+        shell: pwsh
+        run: |
+          ./scripts/msix/build_msix.ps1 `
+            -InstallDir "${{ github.workspace }}/build/OrcaSlicer" `
+            -OutputPath "${{ github.workspace }}/build/OrcaSlicer_Windows_MSIX_${{ env.ver }}.msix" `
+            -IdentityName "${{ vars.ORCA_MSIX_IDENTITY_NAME || 'OrcaSlicer.Dev' }}" `
+            -Publisher "${{ vars.ORCA_MSIX_PUBLISHER || 'CN=00000000-0000-0000-0000-000000000000' }}" `
+            -PublisherDisplayName "${{ vars.ORCA_MSIX_PUBLISHER_DISPLAY_NAME || 'OrcaSlicer (dev)' }}"
+
+      - name: Upload artifacts Win MSIX
+        if: runner.os == 'Windows' && !vars.SELF_HOSTED
+        uses: actions/upload-artifact@v7
+        with:
+          name: OrcaSlicer_Windows_MSIX_${{ env.ver }}
+          path: ${{ github.workspace }}/build/OrcaSlicer_Windows_MSIX_${{ env.ver }}.msix
+
 # Ubuntu
       - name: Apt-Install Dependencies
         if: runner.os == 'Linux' && !vars.SELF_HOSTED
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
index 7c2999e872..98514d99db 100644
--- a/.github/workflows/publish_release.yml
+++ b/.github/workflows/publish_release.yml
@@ -73,8 +73,9 @@ jobs:
 
       - name: Download release artifacts from build run
         run: |
+          # Windows_V* (not Windows_*) keeps the MSIX Store artifact out: it goes to Partner Center, not GitHub releases.
           gh run download "$RUN_ID" --repo "$GITHUB_REPOSITORY" --dir artifacts \
-            -p 'OrcaSlicer_Windows_*' \
+            -p 'OrcaSlicer_Windows_V*' \
             -p 'OrcaSlicer_Mac_universal_*' \
             -p 'OrcaSlicer_Linux_ubuntu_*' \
             -p 'OrcaSlicer-Linux-flatpak_*' \