Skip to content

[Release/10.0] Remove unnecessary architecture-specific conditionals from MsiPackageElements #5336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2025
Merged

[Release/10.0] Remove unnecessary architecture-specific conditionals from MsiPackageElements #5336

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 1 addition & 91 deletions src/windowsdesktop/src/bundle/bundle.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@

<!-- Do not use ProgramFiles6432Folder. It defaults to CSIDL_PROGRAM_FILES and will write
the tag to Program Files when installing the x86 runtime on 64-bit OS. -->
<?if $(var.PlatformToken)~=x86?>
<?if $(PlatformToken)~=X86?>
<SoftwareTag Regid="microsoft.com" InstallPath="[ProgramFilesFolder]dotnet" />
<?else?>
<SoftwareTag Regid="microsoft.com" InstallPath="[ProgramFiles64Folder]dotnet" />
Expand Down Expand Up @@ -199,7 +199,6 @@

<!-- Host is the base component that everything else depends on -->
<?if $(var.IncludeRuntimeMSIs) = true ?>
<?if $(var.PlatformToken)~=x86?>
<MsiPackage
Id="DotNetHost"
SourceFile="$(var.DotNetRedistHostInstaller)"
Expand Down Expand Up @@ -231,97 +230,9 @@
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>
<?elseif $(var.PlatformToken)~=x64?>
<MsiPackage
Id="DotNetHost"
SourceFile="$(var.DotNetRedistHostInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Host">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>

<!-- HostFxr depends on Host -->
<MsiPackage
Id="DotNetHostFxr"
SourceFile="$(var.DotNetRedistHostfxrInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Host FX Resolver">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>

<!-- Runtime depends on Host and HostFxr -->
<MsiPackage
Id="DotNetRuntime"
SourceFile="$(var.DotNetRedistLtsInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Runtime">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>
<?elseif $(var.PlatformToken)~=arm64?>
<MsiPackage
Id="DotNetHost"
SourceFile="$(var.DotNetRedistHostInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Host">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>

<!-- HostFxr depends on Host -->
<MsiPackage
Id="DotNetHostFxr"
SourceFile="$(var.DotNetRedistHostfxrInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Host FX Resolver">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>

<!-- Runtime depends on Host and HostFxr -->
<MsiPackage
Id="DotNetRuntime"
SourceFile="$(var.DotNetRedistLtsInstaller)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft .NET Runtime">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
</MsiPackage>
<?endif?>
<?endif ?>

<!-- Windows Desktop Runtime depends on all the above .NET Core components -->
<?if $(var.PlatformToken)~=x86?>
<MsiPackage
Id="WindowsDesktopRuntime"
SourceFile="$(WindowsDesktopRuntimeMsiPath)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft Windows Desktop Runtime">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
<MsiProperty Name="ARPSYSTEMCOMPONENT" Value="0" />
</MsiPackage>
<?elseif $(var.PlatformToken)~=x64?>
<MsiPackage
Id="WindowsDesktopRuntime"
SourceFile="$(WindowsDesktopRuntimeMsiPath)"
Vital="yes"
Cache="keep"
DisplayName="Microsoft Windows Desktop Runtime">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
<MsiProperty Name="ARPSYSTEMCOMPONENT" Value="0" />
</MsiPackage>
<?elseif $(var.PlatformToken)~=arm64?>
<MsiPackage
Id="WindowsDesktopRuntime"
SourceFile="$(WindowsDesktopRuntimeMsiPath)"
Expand All @@ -332,7 +243,6 @@
<MsiProperty Name="ALLOWMSIINSTALL" Value="True" />
<MsiProperty Name="ARPSYSTEMCOMPONENT" Value="0" />
</MsiPackage>
<?endif?>
</Chain>
</Bundle>
</Wix>