Skip to content

WiX: Add the Testing/WinSDK cross-import overlay #460

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 2 commits into from
Sep 9, 2025
+43 −0
Merged

WiX: Add the Testing/WinSDK cross-import overlay #460

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16bd29c
WiX: Add the Testing/WinSDK cross-import overlay
grynspan Sep 8, 2025
f4e3e2f
I did it wrong
grynspan Sep 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
43 changes: 43 additions & 0 deletions platforms/Windows/platforms/windows/windows.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
<Directory Name="swift">
<Directory Name="windows">
<Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
<Directory Id="_Testing_WinSDK.swiftmodule" Name="_Testing_WinSDK.swiftmodule" />
<?if $(IncludeARM64) = True?>
<Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
<?endif?>
Expand Down Expand Up @@ -327,6 +328,9 @@
<Component Directory="Testing.swiftcrossimport">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
</Component>
<Component Directory="Testing.swiftcrossimport">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\WinSDK.swiftoverlay" />
</Component>
</ComponentGroup>
<?if $(IncludeARM64) = True?>
<ComponentGroup Id="Testing.arm64">
Expand All @@ -336,13 +340,19 @@
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
</Component>
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_WinSDK.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_WinSDK.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
Expand All @@ -357,6 +367,13 @@
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX64) = True?>
Expand All @@ -367,13 +384,19 @@
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
</Component>
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_WinSDK.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_WinSDK.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
Expand All @@ -388,6 +411,13 @@
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>
<?if $(IncludeX86) = True?>
Expand All @@ -398,13 +428,19 @@
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
</Component>
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_WinSDK.dll" />
</Component>

<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
</Component>
<Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_WinSDK.lib" />
</Component>

<Component Directory="Testing.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
Expand All @@ -419,6 +455,13 @@
<Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
</Component>

<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
</Component>
<Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
</Component>
</ComponentGroup>
<?endif?>

Expand Down