Skip to content

Commit ead9fee

Browse files
authored
Fix SWID tag (#51138)
2 parents a48d94a + 8704d51 commit ead9fee

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/Layout/pkg/windows/bundles/sdk/bundle.wxs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
<Payload Name="dotnet.ico" Compressed="yes" SourceFile="..\..\dotnet.ico" />
2828
</BootstrapperApplication>
2929

30-
<SoftwareTag Regid="microsoft.com" InstallPath="[ProgramFiles6432Folder]dotnet" />
30+
<!-- Do not use ProgramFiles6432Folder. It defaults to CSIDL_PROGRAM_FILES and will write
31+
the tag to Program Files when installing the x86 SDK on 64-bit OS. -->
32+
<?if $(TargetArchitecture)~=x86?>
33+
<SoftwareTag Regid="microsoft.com" InstallPath="[ProgramFilesFolder]dotnet" />
34+
<?else?>
35+
<SoftwareTag Regid="microsoft.com" InstallPath="[ProgramFiles64Folder]dotnet" />
36+
<?endif?>
3137

3238
<!-- Search references for upgrade policy keys -->
3339
<util:RegistrySearchRef Id="RemovePreviousVersionRegistryKeySearch"/>

0 commit comments

Comments
 (0)