Skip to content

Commit 8d1f05d

Browse files
committed
WiX: no longer honour OptionsInstallRtl
The runtime library must be installed as the Swift compiler depends on this for the macros support as well as the driver being written in Swift. This is a hard dependency for the build tools.
1 parent c1e4ee6 commit 8d1f05d

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

platforms/Windows/bundle/installer.wxs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<Variable Name="OptionsInstallCli" bal:Overridable="yes" Persisted="yes" Value="1" />
3232
<Variable Name="OptionsInstallDbg" bal:Overridable="yes" Persisted="yes" Value="1" />
3333
<Variable Name="OptionsInstallIde" bal:Overridable="yes" Persisted="yes" Value="1" />
34-
<Variable Name="OptionsInstallRtl" bal:Overridable="yes" Persisted="yes" Value="1" />
34+
<Variable Name="OptionsInstallRtl" Value="1" />
3535
<Variable Name="OptionsInstallSdkX86" bal:Overridable="yes" Persisted="yes" Value="1" />
3636
<Variable Name="OptionsInstallRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
3737
<Variable Name="OptionsInstallSdkAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
@@ -62,7 +62,6 @@
6262
<?if $(VCRedistInstaller) != ""?>
6363
<BundlePackage
6464
SourceFile="$(VCRedistInstaller)"
65-
InstallCondition="OptionsInstallRtl"
6665
Permanent="yes"
6766
InstallArguments="/install /quiet /norestart"
6867
DownloadUrl="$(VCRedistDownloadUrl)">
@@ -71,7 +70,6 @@
7170

7271
<MsiPackage
7372
SourceFile="!(bindpath.rtl)\rtl.msi"
74-
InstallCondition="OptionsInstallRtl"
7573
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
7674
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
7775
</MsiPackage>

0 commit comments

Comments
 (0)