-
Notifications
You must be signed in to change notification settings - Fork 10.4k
[WIP] 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
base: main
Are you sure you want to change the base?
[WIP] 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 |
@@ -1,13 +1,12 @@ | |||
<?xml version="1.0" encoding="utf-8"?> | |||
<Theme xmlns="http://wixtoolset.org/schemas/thmutil/2010"> | |||
<Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil"> | |||
<Window Width="485" Height="347" HexStyle="100a0000" FontId="0">#(loc.Caption)</Window> | |||
<Font Id="0" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font> | |||
<Font Id="1" Height="-24" Weight="500" Foreground="000000">Segoe UI</Font> | |||
<Font Id="2" Height="-22" Weight="500" Foreground="666666">Segoe UI</Font> | |||
<Font Id="3" Height="-12" Weight="500" Foreground="000000" Background="FFFFFF">Segoe UI</Font> | |||
<Font Id="4" Height="-12" Weight="500" Foreground="ff0000" Background="FFFFFF" Underline="yes">Segoe UI</Font> |
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.
Take a look at the SDK PR - you should consider using the predefined system colors. These now work with high contrast themes, making the installer pass a number of accessibility tests that failed in v3
@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 |
Azure Pipelines successfully started running 3 pipeline(s). |
dotnet/arcade#16043 will unblock |
<RelatedBundle Action="Upgrade" Id="{62155173-E27B-3936-997F-56DA96ED19B5}"/> | ||
<!--'Microsoft .NET Core 3.1.0 - Windows Server Hosting'--> | ||
<RelatedBundle Action="Upgrade" Id="{6F741175-2F75-3845-B30B-6C364101EAA2}"/> | ||
<?if $(MajorVersion)=3?> |
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.
Hosting bundle only upgrades on major.minor, so 10 and 3 are SxS. You can probably rip this out. As I recall, in 3.1, we were SxS, so this was needed when we switched to major upgrades to support servicing through Microsoft Update so that any newer 3.1 bundle would remove the older 3.1 versions that had already shipped.
Finally got a green build! Test internal build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2772859&view=results |
#62430