Skip to content

Commit abe687a

Browse files
mhegazycompnerd
authored andcommitted
Reflect variant name in component ids
1 parent d2ba64f commit abe687a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

platforms/Windows/bld/asserts/bld.asserts.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<ItemGroup>
1616
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
17-
<ComponentGroupName>ClangResources</ComponentGroupName>
17+
<ComponentGroupName>ClangResources_asserts</ComponentGroupName>
1818
<DirectoryRefId>_usr_lib_clang</DirectoryRefId>
1919
<PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
2020
<SuppressCom>true</SuppressCom>
@@ -25,7 +25,7 @@
2525

2626
<ItemGroup>
2727
<HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
28-
<ComponentGroupName>SwiftClangResources</ComponentGroupName>
28+
<ComponentGroupName>SwiftClangResources_asserts</ComponentGroupName>
2929
<DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
3030
<PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
3131
<SuppressCom>true</SuppressCom>

platforms/Windows/bld/bld.wxi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -571,8 +571,8 @@
571571
<ComponentGroupRef Id="TestingMacros" />
572572
<ComponentGroupRef Id="mimalloc" />
573573

574-
<ComponentGroupRef Id="ClangResources" />
575-
<ComponentGroupRef Id="SwiftClangResources" />
574+
<ComponentGroupRef Id="ClangResources_asserts" />
575+
<ComponentGroupRef Id="SwiftClangResources_asserts" />
576576

577577
<ComponentGroupRef Id="Configuration" />
578578
<ComponentGroupRef Id="EnvironmentVariables" />

platforms/Windows/cli/asserts/cli.asserts.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
1818
<HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
19-
<ComponentGroupName>DocCRender</ComponentGroupName>
19+
<ComponentGroupName>DocCRender_asserts</ComponentGroupName>
2020
<DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
2121
<PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
2222
<SuppressCom>true</SuppressCom>

platforms/Windows/cli/cli.wxi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@
750750

751751
<ComponentGroupRef Id="DocC" />
752752
<?if $(INCLUDE_SWIFT_DOCC) = True?>
753-
<ComponentGroupRef Id="DocCRender" />
753+
<ComponentGroupRef Id="DocCRender_asserts" />
754754
<?endif?>
755755

756756
<ComponentGroupRef Id="swift_format" />

0 commit comments

Comments
 (0)