Skip to content

Commit

Permalink
Remove Bundle override of DOTNETHOME (dotnet#7855)
Browse files Browse the repository at this point in the history
The bundle was passing in a hardcoded DOTNETHOME value unconditionally
to MSIs in the chain.  This value doesn't have the redirection we're
adding to the MSI.  We can't add that redirection in the bundle, since
Burn doesn't have conditional variables.  It can only set variables as a
result of a search to either the value of the search (if successful) or
1/0.
  • Loading branch information
ericstj committed Sep 17, 2021
1 parent 225f864 commit a0aa5f3
Showing 1 changed file with 2 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@
<PayloadGroupRef Id="DotnetCoreBAPayloads" />
</BootstrapperApplicationRef>

<swid:Tag Regid="microsoft.com" InstallPath="[DOTNETHOME]" />

<Variable Name="DOTNETHOME" Type="string" Value="[$(var.Program_Files)]dotnet" bal:Overridable="no" />
<swid:Tag Regid="microsoft.com" InstallPath="[$(var.Program_Files)]dotnet" />

<!-- Variables used solely for localization. -->
<Variable Name="BUNDLEMONIKER" Type="string" Value="$(var.ProductMoniker) ($(var.TargetArchitectureDescription))" bal:Overridable="no" />
Expand All @@ -54,9 +52,7 @@

<Chain DisableSystemRestore="yes" ParallelCache="yes">
<?foreach chainedFile in $(var.ChainedDotNetPackageFiles)?>
<MsiPackage SourceFile="$(var.chainedFile)">
<MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
</MsiPackage>
<MsiPackage SourceFile="$(var.chainedFile)" />
<?endforeach?>
</Chain>
</Bundle>
Expand Down

0 comments on commit a0aa5f3

Please sign in to comment.