Skip to content

WiX: remove support for packaging the legacy runtime #470

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.

Sign up for GitHub

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

WiX: remove support for packaging the legacy runtime #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5148295
WiX: remove support for packaging the legacy runtime
compnerd Oct 8, 2025
22e3265
WiX: adjust the Android SDK packaging
compnerd Oct 16, 2025
94c9390
WiX: ingest the MSI redistributable in the toolchain
compnerd Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions platforms/Windows/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@
<PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
<Platform>x86</Platform>
</PropertyGroup>
<PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
<IncludeLegacySDK>true</IncludeLegacySDK>
</PropertyGroup>

<PropertyGroup>
<RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
Expand All @@ -45,9 +42,10 @@
ICE38 is about mixing per-user and per-machine resources (not a thing for us).
ICE61 is a warning about allowing "same-version" major upgrades, something we want.
ICE64 is documented as not being an issue when packages are always per-user.
ICE71 is an error if the Media table does not contain an entry with DiskId equal to 1.
ICE91 is about "roaming scenarios," which doesn't apply to our use of LocalAppDataFolder.
-->
<SuppressIces>ICE38;ICE61;ICE64;ICE91</SuppressIces>
<SuppressIces>ICE38;ICE61;ICE64;ICE71;ICE91</SuppressIces>
<PackageScope>perUser</PackageScope>
</PropertyGroup>

Expand Down Expand Up @@ -87,10 +85,7 @@
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
WindowsRuntimeX64=$(WindowsRuntimeX64);
WindowsRuntimeX86=$(WindowsRuntimeX86);
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
IncludeLegacySDK=$(IncludeLegacySDK);
RedistributablesDirectory=$(RedistributablesDirectory);
</DefineConstants>
</PropertyGroup>

Expand Down
6 changes: 2 additions & 4 deletions platforms/Windows/SideBySideUpgradeStrategy.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
<DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
<IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
<IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
<RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
<ExperimentalRTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</ExperimentalRTLUpgradeCode>
<RTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</RTLUpgradeCode>
<AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
<WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
</PropertyGroup>
Expand Down Expand Up @@ -67,8 +66,7 @@
DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
RtlUpgradeCode=$(RtlUpgradeCode);
ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
RTLUpgradeCode=$(RTLUpgradeCode);
AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
</DefineConstants>
Expand Down
40 changes: 14 additions & 26 deletions platforms/Windows/bld/bld.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">

<?if $(sys.BUILDARCH) == x64 ?>
<?define MergeModuleFileName = "rtl.amd64.msm" ?>
<?else?>
<?define MergeModuleFileName = "rtl.$(sys.BUILDARCH).msm" ?>
<?endif?>

<Package
Language="1033"
Manufacturer="!(loc.ManufacturerName)"
Expand Down Expand Up @@ -35,6 +41,10 @@
</Directory>
</DirectoryRef>

<DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
<Merge DiskId="1" Id="swift_runtime" Language="0" SourceFile="$(RedistributablesDirectory)\$(MergeModuleFileName)" />
</DirectoryRef>

<ComponentGroup Id="cmark_gfm" Directory="toolchain_$(VariantName)_usr_bin">
<Component>
<File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
Expand Down Expand Up @@ -212,30 +222,6 @@
</Component>
</ComponentGroup>

<ComponentGroup Id="BlocksRuntime">
<Component Directory="toolchain_$(VariantName)_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
</Component>

<Component Directory="toolchain_$(VariantName)_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
</Component>

<!-- TODO(compnerd) should we install the block headers? -->
</ComponentGroup>

<ComponentGroup Id="libdispatch">
<Component Directory="toolchain_$(VariantName)_usr_bin">
<File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
</Component>

<Component Directory="toolchain_$(VariantName)_usr_lib">
<File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
</Component>

<!-- TODO(compnerd) should we install the dispatch headers? -->
</ComponentGroup>

<ComponentGroup Id="SwiftCxx" Directory="toolchain_$(VariantName)_usr_lib_swift_swiftToCxx">
<Component>
<File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
Expand Down Expand Up @@ -551,15 +537,17 @@
</Component>
</ComponentGroup>

<Feature Id="SwiftRuntimeRedistributable" Title="Swift Runtime Redistributable" AllowAdvertise="no" Display="hidden" Level="1">
<MergeRef Id="swift_runtime" />
</Feature>

<Feature Id="BuildTools" AllowAbsent="no" Title="$(VariantProductName)">
<ComponentGroupRef Id="cmark_gfm" />

<ComponentGroupRef Id="binutils" />
<ComponentGroupRef Id="lto" />
<ComponentGroupRef Id="clang" />
<ComponentGroupRef Id="lld" />
<ComponentGroupRef Id="BlocksRuntime" />
<ComponentGroupRef Id="libdispatch" />
<ComponentGroupRef Id="swift" />
<ComponentGroupRef Id="argument_parser" />
<ComponentGroupRef Id="tools_support_core" />
Expand Down
4 changes: 0 additions & 4 deletions platforms/Windows/bundle/installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@
<ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
</ItemGroup>

<ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
<ProjectReference Include="..\rtl\legacy\msi\rtlmsi.wixproj" BindName="rtl" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\rtl\shared\msi\rtl.shared.msi.wixproj" Properties="ProductArchitecture=$(ProductArchitecture)" BindName="rtl.shared" />
</ItemGroup>
Expand Down
15 changes: 2 additions & 13 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
<Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
<Variable Name="OptionsInstallRTL" Value="1" />
<!-- TODO(compnerd) enable installing non-native RTL (e.g. X64 on ARM64) -->
<Variable Name="OptionsInstallRTL" bal:Overridable="yes" Persisted="yes" Value="1" />

<Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />

Expand Down Expand Up @@ -150,21 +151,12 @@
</MsiPackage>
<?endif?>

<?if $(IncludeLegacySDK) == True?>
<MsiPackage
SourceFile="!(bindpath.rtl)\rtl.msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?else?>
<MsiPackage
SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?endif?>

<?if $(IncludeAndroid) == True?>
<MsiPackage
Expand All @@ -188,15 +180,12 @@
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />

<MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />

<MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />

<MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
</MsiPackage>
<?endif?>
Expand Down
Loading