Skip to content

Commit 6a9c2c6

Browse files
authored
WiX: update SDK installer manifest
swiftlang/swift-corelibs-libdispatch#771 introduced a new header and broke the Windows toolchain due to the missing header. Update the SDK manifest accordingly which is required to get SPM to work again.
1 parent 23584e9 commit 6a9c2c6

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

platforms/Windows/sdk-amd64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,6 @@
180180
<Component Id="dispatch.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a4e8a91e-b54b-485e-8f47-83e23bb435b3">
181181
<File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" />
182182
</Component>
183-
<Component Id="generic_base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="348df76b-0642-4178-a06e-c79ceab474be">
184-
<File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\generic_base.h" Checksum="yes" />
185-
</Component>
186183
<Component Id="group.h" Directory="WindowsSDK_usr_include_dispatch" Guid="6a992ce8-127a-4826-87fc-009e3666c980">
187184
<File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
188185
</Component>
@@ -214,6 +211,9 @@
214211
<File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
215212
</Component>
216213

214+
<Component Id="generic_base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="348df76b-0642-4178-a06e-c79ceab474be">
215+
<File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\generic_base.h" Checksum="yes" />
216+
</Component>
217217
<Component Id="generic_unix_base.h" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
218218
<File Id="generic_unix_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_unix_base.h" Checksum="yes" />
219219
</Component>

platforms/Windows/sdk-arm64.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@
211211
<File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
212212
</Component>
213213

214+
<Component Id="generic_base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a136a05a-acc4-489b-96fc-1413f8421715">
215+
<File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\generic_base.h" Checksum="yes" />
216+
</Component>
214217
<Component Id="generic_unix_base.h" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
215218
<File Id="generic_unix_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_unix_base.h" Checksum="yes" />
216219
</Component>

platforms/Windows/sdk-x86.wxs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,9 @@
211211
<File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
212212
</Component>
213213

214+
<Component Id="generic_base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="c3048f41-e208-45ff-a88f-682ff8292eb8">
215+
<File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
216+
</Component>
214217
<Component Id="generic_unix_base.h" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
215218
<File Id="generic_unix_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_unix_base.h" Checksum="yes" />
216219
</Component>

0 commit comments

Comments
 (0)