Skip to content

[release/6.0] x64 on arm64 fixes #7906

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
markwilkie merged 6 commits into from
Sep 18, 2021
Merged

[release/6.0] x64 on arm64 fixes #7906

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4fbe444
Account for target installer arch in mac pkg id generation (#7831)
sfoslund Sep 9, 2021
225f864
Adding detection and retargeting of DOTNETHOME (#7785)
ericstj Sep 3, 2021
a0aa5f3
Remove Bundle override of DOTNETHOME (#7855)
ericstj Sep 8, 2021
aa0a3d3
Ensure workloads can find embedded dotnethome_x64.wxs (#7845)
ericstj Sep 7, 2021
fe23bc1
Adding x64 emulation support for pkg installers (#7893)
sfoslund Sep 16, 2021
3abbdb8
Update mac x64 installer script arch detection (#7913)
sfoslund Sep 17, 2021
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
Prev Previous commit
Next Next commit
Remove Bundle override of DOTNETHOME (#7855) 
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
ericstj committed Sep 17, 2021
commit a0aa5f36cbf2d3a8570d350711102d7fb6aaefb9
8 changes: 2 additions & 6 deletions src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/bundle/bundle.wxs
View file
Open in desktop
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