Skip to content

[release/5.0] Backport x64 on ARM64 installer changes#37407

Merged
dougbu merged 4 commits into
dotnet:release/5.0from
ericstj:5.0-x64onARM64
Oct 11, 2021
Merged

[release/5.0] Backport x64 on ARM64 installer changes#37407
dougbu merged 4 commits into
dotnet:release/5.0from
ericstj:5.0-x64onARM64

Conversation

@ericstj
Copy link
Copy Markdown
Member

@ericstj ericstj commented Oct 8, 2021 •
edited
Loading

Clean port of all the x64 on ARM64 changes made in 6.0 for 5.0 servicing

6.0 changes:

github-actions Bot and others added 4 commits October 8, 2021 12:52
@github-actions @ericstj
[release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (d…
9c0c572 
…otnet#36695)

* Retarget DOTNETHOME when installing x64 on ARM64

* Make platform comparison case insenstive

* Address feedback

* Install x64 registry keys to different path on ARM64 machine

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@dougbu @ericstj
Update WiX to signed build (dotnet#36865)
c381474 
- dotnet#12078
@github-actions @ericstj
Update wix to 1.0.0-v3.14.0.5722 (dotnet#37329)
cb41834 
Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@github-actions @ericstj
[release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of…
5c5f9a0 
… target machine (dotnet#37335)

* Use WIX_NATIVE_MACHINE to detect native architecture of target machine
* Reference WIX_NATIVE_MACHINE property

Final bit to resolve what I'm tracking in dotnet#37290

Co-authored-by: Eric StJohn <ericstj@microsoft.com>
@ericstj ericstj added the Servicing-consider Shiproom approval is required for the issue label Oct 8, 2021
@ericstj ericstj self-assigned this Oct 8, 2021
@ericstj ericstj requested review from a team and Pilchie as code owners October 8, 2021 20:02
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 8, 2021
@ghost
Copy link
Copy Markdown

ghost commented Oct 8, 2021

Hi @ericstj. Please make sure you've updated the PR description to use the Shiproom Template. Also, make sure this PR is not marked as a draft and is ready-to-merge.

To learn more about how to prepare a servicing PR click here.

dougbu
dougbu approved these changes Oct 8, 2021
View reviewed changes
Copy link
Copy Markdown
Contributor

@dougbu dougbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This all looks very familiar😀 Have changes here and for 'release/3.1' been servicing approved for 5.0.12 and 3.1.21❔

@ericstj
Copy link
Copy Markdown
Member Author

ericstj commented Oct 8, 2021

Have changes here and for 'release/3.1' been servicing approved for 5.0.12 and 3.1.21❔

Not yet, thus the servicing-consider tag. We plan to send mail to tactics once we have all the PRs ready across all repos.

@dougbu dougbu mentioned this pull request Oct 8, 2021
Closed
@ericstj ericstj added Servicing-approved Shiproom has approved the issue and removed Servicing-consider Shiproom approval is required for the issue labels Oct 11, 2021
@ericstj
Copy link
Copy Markdown
Member Author

ericstj commented Oct 11, 2021

This was approved over email. @dotnet/aspnet-build can you help me merge?

@dougbu dougbu merged commit b3238fb into dotnet:release/5.0 Oct 11, 2021
@dougbu
Copy link
Copy Markdown
Contributor

dougbu commented Oct 11, 2021

@dotnet/aspnet-build can you help me merge?

No problem. Thanks for all your work in this area @ericstj❕

@BrennanConroy BrennanConroy added this to the 5.0.12 milestone Oct 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@joeloff joeloff joeloff approved these changes

@NikolaMilosavljevic NikolaMilosavljevic Awaiting requested review from NikolaMilosavljevic

@wtgodbe wtgodbe Awaiting requested review from wtgodbe

@Pilchie Pilchie Awaiting requested review from Pilchie Pilchie is a code owner

+1 more reviewer

@dougbu dougbu dougbu approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@ericstj ericstj

Labels

area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Servicing-approved Shiproom has approved the issue

Projects

None yet

Milestone

5.0.12

Development

Successfully merging this pull request may close these issues.

4 participants

@ericstj @dougbu @joeloff @BrennanConroy