Assume neutral architecture when none is specified #90
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
danbelcher-MSFT
suggested changes
Jan 16, 2018
StoreBroker/PackageTool.ps1
Outdated
| @@ -1962,7 +1967,7 @@ function Get-FormattedFilename | |||
| return $formattedBundleTags -join '_' | |||
| } | |||
|
|
|||
| function Read-ApplicationMetadata | |||
| function Read-OOoOOApplicationMetadata | |||
There was a problem hiding this comment.
What happened here?
There was a problem hiding this comment.
No idea. Fixed, thanks.
| @@ -1608,6 +1608,11 @@ function Read-AppxMetadata | |||
|
|
|||
| $metadata.version = $manifest.Package.Identity.Version | |||
| $metadata.architecture = $manifest.Package.Identity.ProcessorArchitecture | |||
| if ([String]::IsNullOrWhiteSpace($metadata.architecture)) | |||
| { | |||
| $metadata.architecture = "neutral" | |||
There was a problem hiding this comment.
Could be single-assignment:
$metadata.architecture = if (...) { … } else { … }
Alternatively, I've been wanting a custom helper function like:
$metadata.architecture = If-NotNull -Then $manifest.Package.Identity.ProcessorArchitecture -Else "neutral"
There was a problem hiding this comment.
You're describing creating a null-coalescing operator (?? in C#). but for PowerShell.
Given that this is the type of base functionality that a language should support, and given the fact that it's being considered for 6.1, I'd rather not try to roll our own at this time.
I'd prefer to leave as-is.
danbelcher-MSFT
approved these changes
Jan 16, 2018
Per the [MSDN documentation](https://docs.microsoft.com/en-us/uwp/schemas/appxpackage/uapmanifestschema/element-identity), `neutral` is the default value for `ProcessorArchitecture`. Updating our Appx metadata reading logic to assume `neutral` when none is specified. This will avoid a later exception in `Get-FormattedFilename` that does Metadata table validation. Resolves Issue 89
HowardWolosky
force-pushed
the
neutral
branch
from
de140a0 to
ad205ee
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Per the MSDN documentation,
neutralis the default value forProcessorArchitecture.Updating our Appx metadata reading logic to assume
neutralwhen none is specified.This will avoid a later exception in
Get-FormattedFilenamethat does Metadata table validation.Resolves Issue #89