WiX: package up the cross-module overlay

This adds the swift-testing cross-module overlay to the distribution on
Windows.

Author: compnerd

platforms/Windows/sdk/drd/sdk.wxs

@@ -83,7 +83,9 @@
                 <Directory Name="lib">
                   <Directory Name="swift">
                     <Directory Name="android">
+                      <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <Directory Id="Testing_usr_lib_swift_android_ARCH" Name="$(Architecture)" />
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -162,9 +164,21 @@
     </ComponentGroup>
 
     <ComponentGroup Id="Testing">
+      <Component Directory="_Testing_Foundation.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftdoc" />
+      </Component>
+      <Component Directory="_Testing_Foundation.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftinterface" />
+      </Component>
       <Component Directory="Testing_usr_lib_swift_android_ARCH">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\$(Architecture)\libTesting.so" />
       </Component>
+      <Component Directory="Testing_usr_lib_swift_android_ARCH">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVerison)\usr\lib\swift\android\$(Architecture)\lib_Testing_Foundation.so" />
+      </Component>
+      <Component Directory="Testing.swiftcrossimport">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
+      </Component>
       <Component Directory="Testing.swiftmodule">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
       </Component>

platforms/Windows/sdk/win/sdk.wxs

@@ -71,7 +71,9 @@
                 <Directory Name="lib">
                   <Directory Name="swift">
                     <Directory Name="windows">
+                      <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <Directory Id="Testing_usr_lib_swift_windows_ARCH" Name="$(Architecture)" />
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -147,12 +149,24 @@
     </ComponentGroup>
 
     <ComponentGroup Id="Testing">
+      <Component Directory="_Testing_Foundation.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftdoc" />
+      </Component>
+      <Component Directory="_Testing_Foundation.swiftmodule">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\$(Triple).swiftinterface" />
+      </Component>
       <Component Directory="Testing_usr_bin">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\$(ArchitectureBinaryDir)\Testing.dll" />
       </Component>
       <Component Directory="Testing_usr_lib_swift_windows_ARCH">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
       </Component>
+      <Component Directory="Testing_usr_lib_swift_windows_ARCH">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\_Testing_Foundation.lib" />
+      </Component>
+      <Component Directory="Testing.swiftcrossimport">
+        <File Source="$(PLATFORM_ROOT)\Developer\Library\Test-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
+      </Component>
       <Component Directory="Testing.swiftmodule">
         <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-development\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
       </Component>