From a71a72885995b510c703b343ad64f40bc39202d1 Mon Sep 17 00:00:00 2001
From: YR Chen <stevapple@icloud.com>
Date: Sun, 15 Jan 2023 20:22:12 +0800
Subject: [PATCH] WiX: Move `WinSDK.modulemap` into SDK

---
 .../SwiftInstaller/Sources/swift_installer.cc              | 2 --
 platforms/Windows/sdk-amd64.wxs                            | 7 ++++---
 platforms/Windows/sdk-arm64.wxs                            | 7 ++++---
 platforms/Windows/sdk-x86.wxs                              | 7 ++++---
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/platforms/Windows/CustomActions/SwiftInstaller/Sources/swift_installer.cc b/platforms/Windows/CustomActions/SwiftInstaller/Sources/swift_installer.cc
index 137ff536..2b25a48d 100644
--- a/platforms/Windows/CustomActions/SwiftInstaller/Sources/swift_installer.cc
+++ b/platforms/Windows/CustomActions/SwiftInstaller/Sources/swift_installer.cc
@@ -408,8 +408,6 @@ UINT SwiftInstaller_InstallAuxiliaryFiles(MSIHANDLE hInstall) {
       } items[] = {
         { SDKROOT / "usr" / "share" / "ucrt.modulemap",
           UniversalCRTSdkDir / "Include" / version / "ucrt" / "module.modulemap" },
-        { SDKROOT / "usr" / "share" / "winsdk.modulemap",
-          UniversalCRTSdkDir / "Include" / version / "um" / "module.modulemap" },
       };
 
       for (const auto &item : items) {
diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs
index 751ed8b1..6de8359b 100644
--- a/platforms/Windows/sdk-amd64.wxs
+++ b/platforms/Windows/sdk-amd64.wxs
@@ -434,6 +434,10 @@
       <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a117b49f-b373-4ae4-a43e-ea71f7a6be3d">
         <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" Checksum="yes" />
       </Component>
+
+      <Component Id="WinSDK.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
+        <File Id="WinSDK.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\WinSDK.modulemap" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CXXShims">
@@ -461,9 +465,6 @@
       <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
         <File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
       </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
-      </Component>
       <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
         <File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
       </Component>
diff --git a/platforms/Windows/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs
index 11a3ba96..71e307d9 100644
--- a/platforms/Windows/sdk-arm64.wxs
+++ b/platforms/Windows/sdk-arm64.wxs
@@ -434,6 +434,10 @@
       <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="e67725d6-6cee-423d-a758-487ceabd8f13">
         <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" Checksum="yes" />
       </Component>
+
+      <Component Id="WinSDK.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
+        <File Id="WinSDK.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\WinSDK.modulemap" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CXXShims">
@@ -461,9 +465,6 @@
       <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
         <File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
       </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
-      </Component>
       <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
         <File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
       </Component>
diff --git a/platforms/Windows/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs
index da2a0d2f..49624aff 100644
--- a/platforms/Windows/sdk-x86.wxs
+++ b/platforms/Windows/sdk-x86.wxs
@@ -434,6 +434,10 @@
       <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="1f9e4d1b-4a7e-4849-b319-d55510114903">
         <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftWinSDK.lib" Checksum="yes" />
       </Component>
+
+      <Component Id="WinSDK.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
+        <File Id="WinSDK.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\WinSDK.modulemap" Checksum="yes" />
+      </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CXXShims">
@@ -461,9 +465,6 @@
       <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
         <File Id="ucrt.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\ucrt.modulemap" Checksum="yes" />
       </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\winsdk.modulemap" Checksum="yes" />
-      </Component>
       <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
         <File Id="vcruntime.modulemap" Source="$(var.SWIFT_SOURCE_DIR)\stdlib\public\Platform\vcruntime.modulemap" Checksum="yes" />
       </Component>