Skip to content

Commit 7275f4a

Browse files
committed
WiX: correct Dispatch.swiftmodule spelling, x86 builds
Correct the case on the swiftmodule directory name which would prevent Swift from finding the correct swiftmodule. We would fail to realize this installation issue on Windows without a clean installation as the filesystem is case insensitive. The x86 manifest missed the directory path for the swiftmodule for Dispatch. Correct that while fixing the dispatch swiftmodule.
1 parent ee2f116 commit 7275f4a

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

platforms/Windows/sdk-amd64.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</Directory>
7676
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
7777
</Directory>
78-
<Directory Id="dispatch.swiftmodule" Name="dispatch.swiftmodule">
78+
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
7979
</Directory>
8080
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
8181
</Directory>
@@ -220,10 +220,10 @@
220220
<File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
221221
</Component>
222222

223-
<Component Id="Dispatch.swiftdoc" Directory="dispatch.swiftmodule" Guid="ef314d01-4432-43c4-9b11-5725db379551">
223+
<Component Id="Dispatch.swiftdoc" Directory="Dispatch.swiftmodule" Guid="ef314d01-4432-43c4-9b11-5725db379551">
224224
<File Id="Dispatch.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Dispatch.swiftdoc" Checksum="yes" />
225225
</Component>
226-
<Component Id="Dispatch.swiftmodule" Directory="dispatch.swiftmodule" Guid="e9b23638-1dd2-4c95-b053-f97c451625d5">
226+
<Component Id="Dispatch.swiftmodule" Directory="Dispatch.swiftmodule" Guid="e9b23638-1dd2-4c95-b053-f97c451625d5">
227227
<File Id="Dispatch.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Dispatch.swiftmodule" Checksum="yes" />
228228
</Component>
229229

platforms/Windows/sdk-x86.wxs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</Directory>
7676
<Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
7777
</Directory>
78-
<Directory Id="dispatch.swiftmodule" Name="dispatch.swiftmodule">
78+
<Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
7979
</Directory>
8080
<Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
8181
</Directory>
@@ -220,10 +220,10 @@
220220
<File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
221221
</Component>
222222

223-
<Component Id="Dispatch.swiftdoc" Directory="dispatch.swiftmodule" Guid="58f7770e-2cef-4277-8d7f-d0470164442d">
223+
<Component Id="Dispatch.swiftdoc" Directory="Dispatch.swiftmodule" Guid="58f7770e-2cef-4277-8d7f-d0470164442d">
224224
<File Id="Dispatch.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Dispatch.swiftdoc" Checksum="yes" />
225225
</Component>
226-
<Component Id="Dispatch.swiftmodule" Guid="e37a27e0-9462-4eec-8e3d-d028f34a6ff6">
226+
<Component Id="Dispatch.swiftmodule" Directory="Dispatch.swiftmodule" Guid="e37a27e0-9462-4eec-8e3d-d028f34a6ff6">
227227
<File Id="Dispatch.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Dispatch.swiftmodule" Checksum="yes" />
228228
</Component>
229229

0 commit comments

Comments
 (0)