-
Notifications
You must be signed in to change notification settings - Fork 10.4k
Update to wix5 #62885
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
Update to wix5 #62885
Conversation
First test build, since we want to test signing too: https://dev.azure.com/dnceng/internal/_build/results?buildId=2756469&view=results |
This is because Arcade's sdk.targets imports that file: https://github.com/dotnet/arcade/blob/2586309f3f8553152e2d1d54612e9199975f9cd4/src/Microsoft.DotNet.Arcade.Sdk/sdk/Sdk.targets#L13 And so does
This makes me think that typically |
I see, the Wix sdk.targets imports Microsoft.Common.targets now:
Which causes Microsoft.Common.CurrentVersion.targets to get imported, which causes the double-import of |
Nope, didn't run into that for the SDK |
@wtgodbe would it be possible to incorporate wixpack work into this PR? It would help uncover any issues with wixpacks and Essentially, you'd want the same target that SDK has: https://github.com/dotnet/sdk/blob/1b4646d2244ffa462e59f10bc752f2ff6f94b569/src/Layout/pkg/windows/Directory.Build.targets#L46-L68 |
Value="W3SVC" | ||
After="IISCoreWebEngineInstalledSearch_x86" | ||
Result="value" /> | ||
<util:RegistrySearch Id="IISW3SVCInstalledSearch_x86" Variable="IISW3SVCInstalled_x86" Root="HKLM" Key="SOFTWARE\Microsoft\InetStp\Components" Value="W3SVC" After="IISCoreWebEngineInstalledSearch_x86" Result="value" /> |
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.
I wonder if we still support any OS versions where x86 is available. Something to consider cleaning up at some point.
/backport to release/10.0 |
Started backporting to release/10.0: https://github.com/dotnet/aspnetcore/actions/runs/17812494554 |
@wtgodbe 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: Initial commit for wix5 update
Applying: Syntax error
Applying: Update wixproj's
Applying: Acquire wix sdk
Using index info to reconstruct a base tree...
M global.json
Falling back to patching base and 3-way merge...
Auto-merging global.json
Applying: Fix d.b.p/t
Applying: More ordering stuff
Using index info to reconstruct a base tree...
M eng/targets/Wix.Common.targets
Falling back to patching base and 3-way merge...
Auto-merging eng/targets/Wix.Common.targets
CONFLICT (content): Merge conflict in eng/targets/Wix.Common.targets
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 0006 More ordering stuff
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
#62430
Migrate the hosting bundle & runtime bundle to Wix5. Also update Bundle UI to meet new standards