Skip to content

Commit abacf0d

Browse files
authored
Merge pull request #2 from amnweb/feature/msix-installer
fix(build): update architecture handling in MSIX manifest
2 parents 5641737 + f9125c6 commit abacf0d

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

.github/workflows/build_app.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
- name: Get version and MSIX filename
218218
id: info
219219
run: |
220-
$content = Get-Content -Path "app/scripts/build_msix.py" -Raw
220+
$content = Get-Content -Path "app/core/constants.py" -Raw
221221
$version = [regex]::Match($content, 'APP_VERSION\s*=\s*"([^"]+)"').Groups[1].Value
222222
$suffix = "${{ steps.arch.outputs.SUFFIX }}"
223223
$msixArch = "${{ steps.arch.outputs.MSIX_ARCH }}"

app/scripts/build_msix.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ def build_msix(
7272
if not dist_dir.exists():
7373
raise FileNotFoundError(f"dist directory not found: {dist_dir}")
7474

75+
# Windows only accepts: x86, x64, arm, arm64, neutral
76+
manifest_arch = "arm64" if arch == "aarch64" else arch
77+
7578
# Prepare layout directory
7679
layout_dir = output_dir / "layout"
7780
if layout_dir.exists():
@@ -122,7 +125,7 @@ def build_msix(
122125
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
123126
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
124127
IgnorableNamespaces="uap rescap">
125-
<Identity Name="{identity_name}" Publisher="{publisher}" Version="{version}" ProcessorArchitecture="{arch}" />
128+
<Identity Name="{identity_name}" Publisher="{publisher}" Version="{version}" ProcessorArchitecture="{manifest_arch}" />
126129
<Properties>
127130
<DisplayName>{display_name}</DisplayName>
128131
<PublisherDisplayName>{publisher_display_name}</PublisherDisplayName>

0 commit comments

Comments
 (0)