-
Notifications
You must be signed in to change notification settings - Fork 5.2k
Migrate to WiX 5 #117010
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
Migrate to WiX 5 #117010
Conversation
I've pushed the changes with c4720de - this fixes the host project build when using |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pull Request Overview
This PR migrates the .NET runtime installer system from WiX 3 to WiX 5, updating the Windows Installer (.msi) generation infrastructure. The migration involves updating schema namespaces, syntax changes, and dependency configurations across multiple installer components.
Key changes include:
- Updates to WiX schema namespaces from v3 to v5 throughout the codebase
- Modernization of installer component definitions and syntax
- Addition of WiX 5 package dependencies in build files
Reviewed Changes
Copilot reviewed 22 out of 22 changed files in this pull request and generated 55 comments.
Show a summary per file
File | Description |
---|---|
src/installer/pkg/sfx/installers/host.wxs | Core installer definition updated for WiX 5 schema and component syntax |
src/installer/pkg/sfx/installers/Directory.Build.* | Build configuration to include WiX 5 package references |
src/installer/pkg/sfx/bundle/theme/*.wxl | Localization files updated to WiX 5 schema and syntax changes |
src/installer/pkg/sfx/bundle/bundle.thm | Theme definition modernized for WiX 5 with improved accessibility |
src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj | Bundle project updated with WiX 5 dependencies |
src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.* | Build files updated to include WiX 5 package references |
eng/Versions.props | Version definitions for WiX 5 package dependencies |
src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
Outdated
Show resolved
Hide resolved
src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.targets
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
nit: Can you fix the exlude -> exclude
typos?
src/installer/pkg/sfx/bundle/Microsoft.NETCore.App.Bundle.bundleproj
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Pranav and I chatted offline - there is an Arcade fix required to ensure that bundles are always x86 applications. Other than that, I'm ok to sign off
/backport to release/10.0 |
Started backporting to release/10.0: https://github.com/dotnet/runtime/actions/runs/17850381282 |
@PranavSenthilnathan backporting to "release/10.0" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: wix 5
Using index info to reconstruct a base tree...
M eng/Versions.props
M src/installer/pkg/sfx/installers/host.wxs
Falling back to patching base and 3-way merge...
Auto-merging eng/Versions.props
Auto-merging src/installer/pkg/sfx/installers/host.wxs
CONFLICT (content): Merge conflict in src/installer/pkg/sfx/installers/host.wxs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 wix 5
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
Co-authored-by: Nikola Milosavljevic <[email protected]>
Co-authored-by: Nikola Milosavljevic <[email protected]>
Co-authored-by: Nikola Milosavljevic <[email protected]>
Depends on: dotnet/arcade#15933
Contributes to #116878