Skip to content

WiX: remove support for packaging the legacy runtime #479

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 2 commits into
base: main
Choose a base branch
from
+3,025 −3,447
Open

WiX: remove support for packaging the legacy runtime #479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4a9736
WiX: remove support for packaging the legacy runtime
compnerd Oct 8, 2025
7e28dc4
WiX: adjust the Android SDK packaging
compnerd Oct 16, 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
10 changes: 2 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,6 @@
WindowsRuntimeARM64=$(WindowsRuntimeARM64);
WindowsRuntimeX64=$(WindowsRuntimeX64);
WindowsRuntimeX86=$(WindowsRuntimeX86);
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
IncludeLegacySDK=$(IncludeLegacySDK);
</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
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
12 changes: 0 additions & 12 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,21 +150,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 +179,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