Skip to content

WiX: Add _TestingInterop #475

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 1 commit into from
Nov 3, 2025
Merged

WiX: Add _TestingInterop #475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 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 @@ -360,6 +360,9 @@
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_WinSDK.dll" />
</Component>
<Component Directory="Testing_usr_bin64a" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_TestingInterop.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" />
Expand All @@ -370,6 +373,9 @@
<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_usr_lib_swift_windows_arm64" DiskId="2">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_TestingInterop.lib" />
Copy link
Contributor Author

@jerryjrchen jerryjrchen Oct 30, 2025

Choose a reason for hiding this comment

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

I'm admittedly just copying similar examples already here, so I wanted to call this part out. The .lib in my Windows toolchain seems to be static libs:

jerryjrchen@JJC-WINDOWS:/mnt/c/Users/jerryjrchen/AppData/Local/Programs/Swift/Platforms/0.0.0$ file ./Windows.platform/Developer/Library/Testing-0.0.0/usr/lib/swift/windows/aarch64/Testing.lib
./Windows.platform/Developer/Library/Testing-0.0.0/usr/lib/swift/windows/aarch64/Testing.lib: current ar archive

I assume this means we support building both statically and dynamically linked test bundles (binaries?) on Windows?

Copy link
Contributor

@grynspan grynspan Oct 30, 2025

Choose a reason for hiding this comment

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

Windows exposes library content differently than you're used to. Let's sync up later today and I'll try to share what little I know.

</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 Down Expand Up @@ -404,6 +410,9 @@
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_WinSDK.dll" />
</Component>
<Component Directory="Testing_usr_bin64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_TestingInterop.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" />
Expand All @@ -414,6 +423,9 @@
<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_usr_lib_swift_windows_x64" DiskId="3">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_TestingInterop.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 Down Expand Up @@ -448,6 +460,9 @@
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_WinSDK.dll" />
</Component>
<Component Directory="Testing_usr_bin32" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_TestingInterop.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" />
Expand All @@ -458,6 +473,9 @@
<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_usr_lib_swift_windows_x86" DiskId="4">
<File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_TestingInterop.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 Down