Skip to content

Commit 7dc04ec

Browse files
committed
Use wix 4.0.5 without explicit ui sequences
1 parent 2a16cc1 commit 7dc04ec

File tree

2 files changed

+4
-17
lines changed

2 files changed

+4
-17
lines changed

build/windows/installer/InstallDirUi.wxs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3-
xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
2+
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
43
<!-- Copied from https://github.com/wixtoolset/wix4/blob/6f2511f58f60e63a15357a2fe37f83343dea3090/src/ext/UI/wixlib/WixUI_InstallDir.wxs#L9
54
but with the license dialog disabled.
65
See: https://wixtoolset.org/docs/v3/wixui/wixui_customizations/#changing-the-ui-sequence-of-a-built-in-dialog-set. -->
@@ -46,18 +45,6 @@
4645
<Publish Dialog="MaintenanceTypeDlg" Control="Back" Event="NewDialog" Value="MaintenanceWelcomeDlg" />
4746

4847
<Property Id="ARPNOMODIFY" Value="1" />
49-
50-
<InstallUISequence>
51-
<Show Dialog="FatalError" OnExit="error" />
52-
<Show Dialog="UserExit" OnExit="cancel" />
53-
<Show Dialog="ExitDialog" OnExit="success" />
54-
</InstallUISequence>
55-
56-
<AdminUISequence>
57-
<Show Dialog="FatalError" OnExit="error" />
58-
<Show Dialog="UserExit" OnExit="cancel" />
59-
<Show Dialog="ExitDialog" OnExit="success" />
60-
</AdminUISequence>
6148
</UI>
6249

6350
<UIRef Id="WixUI_Common" />

build/windows/installer/Installer.wixproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="WixToolset.Sdk/4.0.0">
2+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" Sdk="WixToolset.Sdk/4.0.5">
33
<PropertyGroup>
44
<DebugType>none</DebugType>
55
<OutputName>installer</OutputName>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
9-
<PackageReference Include="WixToolset.Heat" Version="4.0.0" />
8+
<PackageReference Include="WixToolset.UI.wixext" Version="4.0.5" />
9+
<PackageReference Include="WixToolset.Heat" Version="4.0.5" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

0 commit comments

Comments
 (0)