Skip to content

Conversation

PranavSenthilnathan
Copy link
Member

@PranavSenthilnathan PranavSenthilnathan commented Jun 25, 2025

Depends on: dotnet/arcade#15933

Contributes to #116878

@NikolaMilosavljevic
Copy link
Member

I've pushed the changes with c4720de - this fixes the host project build when using -wx switch in wix.exe build command. I am adding this switch to the build, in upcoming arcade change - this makes the build behave the same as if invoked using Wix build targets, instead of direct wix.exe build invocation. This also makes runtime build behave the same as sdk and aspnetcore builds.

@PranavSenthilnathan PranavSenthilnathan marked this pull request as ready for review September 18, 2025 16:20
@PranavSenthilnathan PranavSenthilnathan changed the title [WIP] Migrate to WiX 5 Migrate to WiX 5 Sep 18, 2025
Copy link
Contributor

@Copilot Copilot AI left a 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

Copy link
Member

@jkoritzinsky jkoritzinsky left a 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?

Copy link
Member

@joeloff joeloff left a 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

@PranavSenthilnathan PranavSenthilnathan enabled auto-merge (squash) September 18, 2025 21:30
@PranavSenthilnathan PranavSenthilnathan merged commit b7bdf4e into dotnet:main Sep 19, 2025
160 checks passed
@PranavSenthilnathan
Copy link
Member Author

/backport to release/10.0

Copy link
Contributor

Copy link
Contributor

@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!

PranavSenthilnathan added a commit to PranavSenthilnathan/runtime that referenced this pull request Sep 19, 2025
Co-authored-by: Nikola Milosavljevic <[email protected]>
jozkee pushed a commit that referenced this pull request Sep 19, 2025
Co-authored-by: Nikola Milosavljevic <[email protected]>
xtqqczze pushed a commit to xtqqczze/dotnet-runtime that referenced this pull request Sep 20, 2025
Co-authored-by: Nikola Milosavljevic <[email protected]>
@github-actions github-actions bot locked and limited conversation to collaborators Oct 19, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants