Skip to content

Commit b7a440d

Browse files
committed
Update FoundationCollections module names
Swift-Collections switched to using the full module triple. We're updating Swift to use a newer Swift-Collections, so updating the filenames here.
1 parent 17dc0a7 commit b7a440d

File tree

1 file changed

+0
-36
lines changed

1 file changed

+0
-36
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,65 +1474,41 @@
14741474
<?if $(IncludeARM64) = True?>
14751475
<ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
14761476
<Component DiskId="2">
1477-
<!-- FIXME(swiftlang/swift-foundation#1230)
14781477
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1479-
-->
1480-
<File Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64.swiftdoc" />
14811478
</Component>
14821479
<Component DiskId="2">
1483-
<!-- FIXME(swiftlang/swift-foundation#1230)
14841480
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1485-
-->
1486-
<File Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64.swiftmodule" />
14871481
</Component>
14881482
</ComponentGroup>
14891483
<?endif?>
14901484
<?if $(IncludeX64) = True?>
14911485
<ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
14921486
<Component DiskId="3">
1493-
<!-- FIXME(swiftlang/swift-foundation#1230)
14941487
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1495-
-->
1496-
<File Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64.swiftdoc" />
14971488
</Component>
14981489
<Component DiskId="3">
1499-
<!-- FIXME(swiftlang/swift-foundation#1230)
15001490
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1501-
-->
1502-
<File Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64.swiftmodule" />
15031491
</Component>
15041492
</ComponentGroup>
15051493
<?endif?>
15061494
<?if $(IncludeX86) = True?>
15071495
<ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
15081496
<Component DiskId="4">
1509-
<!-- FIXME(swiftlang/swift-foundation#1230)
15101497
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1511-
-->
1512-
<File Name="i686-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686.swiftdoc" />
15131498
</Component>
15141499
<Component DiskId="4">
1515-
<!-- FIXME(swiftlang/swift-foundation#1230)
15161500
<File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1517-
-->
1518-
<File Name="i686-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686.swiftmodule" />
15191501
</Component>
15201502
</ComponentGroup>
15211503
<?endif?>
15221504

15231505
<?if $(IncludeARM64) = True?>
15241506
<ComponentGroup Id="lib_FoundationCollections.arm64" Directory="lib_FoundationCollections.swiftmodule">
15251507
<Component DiskId="6">
1526-
<!-- FIXME(swiftlang/swift-foundation#1230)
15271508
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
1528-
-->
1529-
<File Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64.swiftdoc" />
15301509
</Component>
15311510
<Component DiskId="6">
1532-
<!-- FIXME(swiftlang/swift-foundation#1230)
15331511
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
1534-
-->
1535-
<File Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64.swiftmodule" />
15361512
</Component>
15371513

15381514
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
@@ -1543,16 +1519,10 @@
15431519
<?if $(IncludeX64) = True?>
15441520
<ComponentGroup Id="lib_FoundationCollections.x64" Directory="lib_FoundationCollections.swiftmodule">
15451521
<Component DiskId="7">
1546-
<!-- FIXME(swiftlang/swift-foundation#1230)
15471522
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
1548-
-->
1549-
<File Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64.swiftdoc" />
15501523
</Component>
15511524
<Component DiskId="7">
1552-
<!-- FIXME(swiftlang/swift-foundation#1230)
15531525
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
1554-
-->
1555-
<File Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64.swiftmodule" />
15561526
</Component>
15571527

15581528
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
@@ -1563,16 +1533,10 @@
15631533
<?if $(IncludeX86) = True?>
15641534
<ComponentGroup Id="lib_FoundationCollections.x86" Directory="lib_FoundationCollections.swiftmodule">
15651535
<Component DiskId="8">
1566-
<!-- FIXME(swiftlang/swift-foundation#1230)
15671536
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
1568-
-->
1569-
<File Name="i686-unknown-windows-msvc.swiftdoc" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686.swiftdoc" />
15701537
</Component>
15711538
<Component DiskId="8">
1572-
<!-- FIXME(swiftlang/swift-foundation#1230)
15731539
<File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
1574-
-->
1575-
<File Name="i686-unknown-windows-msvc.swiftmodule" Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686.swiftmodule" />
15761540
</Component>
15771541

15781542
<Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">

0 commit comments

Comments
 (0)