Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use FolderId_ProgramFiles for non x86 default machine portable folder #3137

Merged
merged 3 commits into from Apr 10, 2023

Conversation

yao-msft
Copy link
Contributor

@yao-msft yao-msft commented Apr 8, 2023

This change keeps existing behavior for x64 and arm64. On x86 machines, both point to C:\program files, and it's not breaking (actually the else part will not even be triggered).

Microsoft Reviewers: Open in CodeFlow

@yao-msft yao-msft requested a review from a team as a code owner April 8, 2023 01:30
@Trenly
Copy link
Contributor

Trenly commented Apr 8, 2023

Thanks for fixing this! Sorry for not considering the emulated case

@yao-msft
Copy link
Contributor Author

yao-msft commented Apr 8, 2023

After more investigation, I feel this fix is just hiding some potential failures. I need to trace back to see why this code assumes either x86 or x64.

if a portable package is arm64, it should not be put under Program Files(x64) on an arm64 machine.

Edit: on arm64 machines Program Files folder contain both x64 and arm64 apps.

I think the correct fix may just be fall back to FolderId_ProgramFiles

@yao-msft yao-msft changed the title Do not output inapplicable directories in wingetinfo Use FolderId_ProgramFiles for non x86 default machine portable folder Apr 8, 2023
@yao-msft
Copy link
Contributor Author

yao-msft commented Apr 8, 2023

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yao-msft yao-msft merged commit 719e475 into microsoft:master Apr 10, 2023
8 checks passed
@yao-msft yao-msft deleted the fixtests branch April 10, 2023 20:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants