Skip to content

Commit 87d72d7

Browse files
committed
WiX: switch to WixUI_Advanced for changing to per-user install
This adjusts the toolchain MSI packaging to use per-user installs rather than per-machine. While per-machine scope is preferable, this allows us to drop the requirement for Administrator rights. Longer term, we would want dual-purpose MSIs when we can drive that from the bootstrapper UI.
1 parent e896616 commit 87d72d7

File tree

5 files changed

+15
-25
lines changed

5 files changed

+15
-25
lines changed

platforms/Windows/bld.wxs

+3-5
Original file line numberDiff line numberDiff line change
@@ -373,13 +373,11 @@
373373
</Feature>
374374

375375
<UI>
376-
<ui:WixUI Id="WixUI_InstallDir" />
377-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
378-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
376+
<ui:WixUI Id="WixUI_Advanced" />
377+
<Property Id="ApplicationFolderName" Value="Swift" />
378+
<Property Id="WixAppFolder" Value="WixPerUserFolder" />
379379
</UI>
380380

381-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
382-
383381
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
384382
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
385383
</Package>

platforms/Windows/cli.wxs

+3-5
Original file line numberDiff line numberDiff line change
@@ -256,13 +256,11 @@
256256
</Feature>
257257

258258
<UI>
259-
<ui:WixUI Id="WixUI_InstallDir" />
260-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
261-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
259+
<ui:WixUI Id="WixUI_Advanced" />
260+
<Property Id="ApplicationFolderName" Value="Swift" />
261+
<Property Id="WixAppFolder" Value="WixPerUserFolder" />
262262
</UI>
263263

264-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
265-
266264
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
267265
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
268266
</Package>

platforms/Windows/dbg.wxs

+3-5
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,11 @@
119119
</Feature>
120120

121121
<UI>
122-
<ui:WixUI Id="WixUI_InstallDir" />
123-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
124-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
122+
<ui:WixUI Id="WixUI_Advanced" />
123+
<Property Id="ApplicationFolderName" Value="Swift" />
124+
<Property Id="WixAppFolder" Value="WixPerUserFolder" />
125125
</UI>
126126

127-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
128-
129127
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
130128
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
131129
</Package>

platforms/Windows/ide.wxs

+3-5
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@
6767
</Feature>
6868

6969
<UI>
70-
<ui:WixUI Id="WixUI_InstallDir" />
71-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
72-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
70+
<ui:WixUI Id="WixUI_Advanced" />
71+
<Property Id="ApplicationFolderName" Value="Swift" />
72+
<Property Id="WixAppFolder" Value="WixPerUserFolder" />
7373
</UI>
7474

75-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
76-
7775
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
7876
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
7977
</Package>

platforms/Windows/runtime.wxs

+3-5
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,11 @@
122122
</Feature>
123123

124124
<UI>
125-
<ui:WixUI Id="WixUI_InstallDir" />
126-
<Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
127-
<Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
125+
<ui:WixUI Id="WixUI_Advanced" />
126+
<Property Id="ApplicationFolderName" Value="Swift" />
127+
<Property Id="WixAppFolder" Value="WixPerUserFolder" />
128128
</UI>
129129

130-
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
131-
132130
<WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
133131
<WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
134132
</Package>

0 commit comments

Comments
 (0)