Skip to content

Commit 1bda936

Browse files
lxbndrcompnerd
lxbndr
authored and
compnerd
committed
WiX: enable selection of installation path for msi bundles
1 parent 8d32d4c commit 1bda936

16 files changed

+115
-20
lines changed

‎platforms/Windows/Resources/swift_banner.png

1.17 KB
Loading

‎platforms/Windows/Resources/swift_dialog.png

8.58 KB
Loading

‎platforms/Windows/devtools-amd64.wxs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,14 @@
259259
<?endif?>
260260
</Feature>
261261

262-
<!-- UI -->
263-
<UI />
262+
<UI>
263+
<UIRef Id="WixUI_InstallDir" />
264+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
265+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
266+
</UI>
267+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
268+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
269+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
270+
264271
</Product>
265272
</Wix>

‎platforms/Windows/devtools-arm64.wxs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,14 @@
259259
<?endif?>
260260
</Feature>
261261

262-
<!-- UI -->
263-
<UI />
262+
<UI>
263+
<UIRef Id="WixUI_InstallDir" />
264+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
265+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
266+
</UI>
267+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
268+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
269+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
270+
264271
</Product>
265272
</Wix>

‎platforms/Windows/devtools.wixproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@
3838
<HarvestDirectorySuppressRootDirectory>true</HarvestDirectorySuppressRootDirectory>
3939
</PropertyGroup>
4040

41+
<ItemGroup>
42+
<WixExtension Include="WixUIExtension">
43+
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
44+
<Name>WixUIExtension</Name>
45+
</WixExtension>
46+
</ItemGroup>
47+
4148
<ItemGroup>
4249
<Compile Include="devtools-$(ProductArchitecture).wxs" />
4350
</ItemGroup>

‎platforms/Windows/runtime-amd64.wxs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,14 @@
182182
<?endif?>
183183
</Feature>
184184

185-
<!-- UI -->
186-
<UI />
185+
<UI>
186+
<UIRef Id="WixUI_InstallDir" />
187+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
188+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
189+
</UI>
190+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
191+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
192+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
193+
187194
</Product>
188195
</Wix>

‎platforms/Windows/runtime-arm64.wxs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,14 @@
182182
<?endif?>
183183
</Feature>
184184

185-
<!-- UI -->
186-
<UI />
185+
<UI>
186+
<UIRef Id="WixUI_InstallDir" />
187+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
188+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
189+
</UI>
190+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
191+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
192+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
193+
187194
</Product>
188195
</Wix>

‎platforms/Windows/runtime-x86.wxs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,14 @@
181181
<?endif?>
182182
</Feature>
183183

184-
<!-- UI -->
185-
<UI />
184+
<UI>
185+
<UIRef Id="WixUI_InstallDir" />
186+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
187+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
188+
</UI>
189+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
190+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
191+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
192+
186193
</Product>
187194
</Wix>

‎platforms/Windows/runtime.wixproj

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@
4646
<InstallerPlatform>x86</InstallerPlatform>
4747
</PropertyGroup>
4848

49+
<ItemGroup>
50+
<WixExtension Include="WixUIExtension">
51+
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
52+
<Name>WixUIExtension</Name>
53+
</WixExtension>
54+
</ItemGroup>
55+
4956
<ItemGroup>
5057
<Compile Include="runtime-$(ProductArchitecture).wxs" />
5158
</ItemGroup>

‎platforms/Windows/sdk-amd64.wxs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -495,8 +495,14 @@
495495
<?endif ?>
496496
</Feature>
497497

498-
<!-- UI -->
499-
<UI />
498+
<UI>
499+
<UIRef Id="WixUI_InstallDir" />
500+
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2">1</Publish>
501+
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2">1</Publish>
502+
</UI>
503+
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" ></Property>
504+
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
505+
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
500506

501507
<!-- Custom Actions -->
502508
<Binary Id="SwiftInstaller.dll"

0 commit comments

Comments
 (0)