WiX: begin the extraction of the legacy SDK #461
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This moves the legacy RTL packaging into a subdirectory as preparation for resection.
mhegazy
reviewed
Sep 19, 2025
| @@ -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> | |||
There was a problem hiding this comment.
Not sure I see the incorrect indentation. This is indented the same as SwiftShimsPath.
mhegazy
reviewed
Sep 19, 2025
mhegazy
approved these changes
Sep 19, 2025
This adjusts the packaging to allow exclusion of the legacy SDK. This is a preparatory step towards removing the legacy SDK from the build and the packaging.
Adjust the package authoring to use separate paths as we prepare to eject the legacy SDK.
Adjust the feature set to extract platform support from the SDK content. This allows us to have the platform specific libraries (XCTest, Testing) isolated from the SDK content. It also allows us to temporarily share the features across the legacy and experimental SDKs.
Package up the static library dependencies that are required for FoundationNetworking, FoundationXML. These are packaged with the experimental SDK as they are required only for static linking.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request introduces conditional support for including a legacy Windows SDK in the build and installer process. The main change is the addition of the
IncludeLegacySDKproperty, which controls whether legacy SDK components are included. The build scripts, installer projects, and configuration files have been updated to selectively include legacy or experimental SDK files and components based on this property.Conditional legacy SDK support
IncludeLegacySDKproperty toDirectory.Build.propsand passed it through build constants to enable conditional inclusion of legacy SDK components. [1] [2]installer.wixprojandwindows.wixprojto conditionally add references to legacy SDK project files and components whenIncludeLegacySDKis set to true. [1] [2]installer.wxsto select between legacy and shared MSI packages depending on the legacy SDK flag. [1] [2]Installer and component configuration changes
windows.wxsto define SDK roots, directory structures, and component groups for legacy SDK files, ensuring only the relevant files are included based on the build configuration. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17] [18] [19] [20] [21] [22] [23] [24] [25]These changes make it possible to build and install either the legacy or experimental Windows SDK by simply setting the
IncludeLegacySDKproperty, improving flexibility and easing the transition to the new SDK.