Skip to content

WiX: begin the extraction of the legacy SDK #461

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

Merged
merged 5 commits into from
Sep 30, 2025
Merged

WiX: begin the extraction of the legacy SDK #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4dbac8
WiX: reorganise the legacy RTL
compnerd Sep 10, 2025
b50e262
WiX: optionalise the LegacySDK
compnerd Sep 11, 2025
3e70dff
WiX: isolate experimental shims from legacy shims
compnerd Sep 12, 2025
2ab082b
WiX: adjust features for shared content
compnerd Sep 12, 2025
55b5779
WiX: package up static libraries for static SDK
compnerd Sep 20, 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
4 changes: 4 additions & 0 deletions platforms/Windows/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
<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 Down Expand Up @@ -87,6 +90,7 @@
WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
IncludeLegacySDK=$(IncludeLegacySDK);
</DefineConstants>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions platforms/Windows/bundle/installer.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
</ItemGroup>

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

<ItemGroup>
Expand Down
23 changes: 16 additions & 7 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,6 @@
-->

<Chain>
<MsiPackage
SourceFile="!(bindpath.rtl)\rtl.msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
</MsiPackage>

<MsiPackage
SourceFile="!(bindpath.bld.asserts)\bld.asserts.msi"
InstallCondition="OptionsInstallAssertsToolchain = 1"
Expand Down Expand Up @@ -157,6 +150,22 @@
</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
SourceFile="!(bindpath.platform.android)\android.msi"
Expand Down
14 changes: 8 additions & 6 deletions platforms/Windows/platforms/windows/windows.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
<OutputName>windows</OutputName>

<SwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\shims</SwiftShimsPath>
<ExperimentalSwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift\shims</ExperimentalSwiftShimsPath>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wrong indentation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I see the incorrect indentation. This is indented the same as SwiftShimsPath.


<DefineConstants>
$(DefineConstants);
SwiftShimsPath=$(SwiftShimsPath);
ExperimentalSwiftShimsPath=$(ExperimentalSwiftShimsPath);
IncludeARM64=$(WindowsArchitectures.Contains("aarch64"));
IncludeX64=$(WindowsArchitectures.Contains("x86_64"));
IncludeX86=$(WindowsArchitectures.Contains("i686"));
Expand All @@ -18,24 +20,24 @@
</ItemGroup>

<ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
<ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.shared.x86.msm" />
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.static.x86.msm" />
</ItemGroup>

<ItemGroup Condition=" $(WindowsArchitectures.Contains('x86_64')) ">
<ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.shared.amd64.msm" />
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.static.amd64.msm" />
</ItemGroup>

<ItemGroup Condition=" $(WindowsArchitectures.Contains('aarch64')) ">
<ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
<ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
<ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.shared.arm64.msm" />
<ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.static.arm64.msm" />
</ItemGroup>

<ItemGroup>
<ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
<HarvestDirectory Include="$(SwiftShimsPath)">
<ComponentGroupName>SwiftShims</ComponentGroupName>
<DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
Expand All @@ -47,10 +49,10 @@
</ItemGroup>

<ItemGroup>
<HarvestDirectory Include="$(SwiftShimsPath)">
<HarvestDirectory Include="$(ExperimentalSwiftShimsPath)">
<ComponentGroupName>ExperimentalSwiftShims</ComponentGroupName>
<DirectoryRefId>WindowsExperimentalSDK_usr_lib_swift_shims</DirectoryRefId>
<PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
<PreprocessorVariable>var.ExperimentalSwiftShimsPath</PreprocessorVariable>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
<SuppressRootDirectory>true</SuppressRootDirectory>
Expand Down
Loading