Skip to content

Commit 17217b9

Browse files
committed
Test
1 parent 2c30234 commit 17217b9

File tree

2 files changed

+4
-19
lines changed

2 files changed

+4
-19
lines changed

.github/scripts/Create-MsixBundle.ps1

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -119,22 +119,17 @@ if ($AppInstallerUri -ne "" -and ($BuildMode -eq "Sideload" -or $BuildMode -eq "
119119
}
120120

121121
# Determine architecture from the manifest Identity
122-
$ns = @{ pkg = "http://schemas.microsoft.com/appx/manifest/foundation/windows10" }
123-
$identity = $msixManifest.SelectSingleNode("/pkg:Package/pkg:Identity", (New-Object System.Xml.XmlNamespaceManager($msixManifest.NameTable)))
122+
$nsmgr = New-Object System.Xml.XmlNamespaceManager($msixManifest.NameTable)
123+
$nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10")
124+
$identity = $msixManifest.SelectSingleNode("/pkg:Package/pkg:Identity", $nsmgr)
124125
if ($null -eq $identity) {
125-
# Try without namespace
126126
$arch = "x64"
127127
} else {
128-
$nsmgr = New-Object System.Xml.XmlNamespaceManager($msixManifest.NameTable)
129-
$nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10")
130-
$identityNode = $msixManifest.SelectSingleNode("/pkg:Package/pkg:Identity", $nsmgr)
131-
$arch = $identityNode.GetAttribute("ProcessorArchitecture")
128+
$arch = $identity.GetAttribute("ProcessorArchitecture")
132129
if ([string]::IsNullOrEmpty($arch)) { $arch = "x64" }
133130
}
134131

135132
# Parse PackageDependency entries
136-
$nsmgr = New-Object System.Xml.XmlNamespaceManager($msixManifest.NameTable)
137-
$nsmgr.AddNamespace("pkg", "http://schemas.microsoft.com/appx/manifest/foundation/windows10")
138133
$deps = $msixManifest.SelectNodes("/pkg:Package/pkg:Dependencies/pkg:PackageDependency", $nsmgr)
139134

140135
foreach ($dep in $deps) {

.github/workflows/cd-sideload-preview.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -171,16 +171,6 @@ jobs:
171171
timestamp-rfc3161: http://timestamp.acs.microsoft.com
172172
timestamp-digest: SHA256
173173

174-
- name: Upload packages to Cloudflare
175-
uses: ryand56/r2-upload-action@latest
176-
with:
177-
r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
178-
r2-access-key-id: ${{ secrets.R2_ACCESS_KEY_ID }}
179-
r2-secret-access-key: ${{ secrets.R2_SECRET_ACCESS_KEY }}
180-
r2-bucket: ${{ secrets.R2_BUCKET }}
181-
source-dir: ${{ env.APPX_PACKAGE_DIR }}
182-
destination-dir: ./files/preview
183-
184174
- name: Upload the packages to GitHub Actions
185175
uses: actions/upload-artifact@v4
186176
with:

0 commit comments

Comments
 (0)