Skip to content

Commit dac5ba0

Browse files
committed
WiX: clean up component naming for Foundation shims
Rename `lib_FoundationCShims` and `lib_FoundationUnicode` to an `Experimental` prefix without `lib`. This component is shared across static and dynamic portions of the new SDK.
1 parent c51a61d commit dac5ba0

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

platforms/Windows/platforms/windows/windows.wxs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -722,7 +722,7 @@
722722
</ComponentGroup>
723723
<?endif?>
724724

725-
<ComponentGroup Id="lib_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
725+
<ComponentGroup Id="Experimental_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
726726
<?define Disk = 5?>
727727
<?include ../_FoundationUnicode.wxi?>
728728
<?undef Disk?>
@@ -757,7 +757,7 @@
757757
<?undef Disk?>
758758
</ComponentGroup>
759759

760-
<ComponentGroup Id="lib_FoundationCShims" Directory="WindowsExperimentalSDK_usr_include__FoundationCShims">
760+
<ComponentGroup Id="Experimental_FoundationCShims" Directory="WindowsExperimentalSDK_usr_include__FoundationCShims">
761761
<?define Disk = 5?>
762762
<?include ../_FoundationCShims.wxi?>
763763
<?undef Disk?>
@@ -3204,9 +3204,6 @@
32043204
<?endif?>
32053205

32063206
<Feature Id="ExperimentalSDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental)">
3207-
<ComponentGroupRef Id="lib_FoundationUnicode" />
3208-
<ComponentGroupRef Id="lib_FoundationCShims" />
3209-
32103207
<ComponentGroupRef Id="ExperimentalAPINotes" />
32113208
<ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
32123209
<ComponentGroupRef Id="ExperimentalBlocksRuntime" />
@@ -3215,6 +3212,8 @@
32153212
<ComponentGroupRef Id="ExperimentalDispatch" />
32163213
<ComponentGroupRef Id="ExperimentalSwiftRemoteMirror" />
32173214
<ComponentGroupRef Id="ExperimentalSwiftShims" />
3215+
<ComponentGroupRef Id="Experimental_FoundationCShims" />
3216+
<ComponentGroupRef Id="Experimental_FoundationUnicode" />
32183217

32193218
<!-- MSI management Components -->
32203219
<ComponentGroupRef Id="VersionedDirectoryCleanup" />

0 commit comments

Comments
 (0)