Skip to content

[release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine #37335

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.

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 2 commits into from
Oct 6, 2021

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 6, 2021

Backport of #37318 to release/6.0

/cc @ericstj

Customer Impact

Reliably detect machine architecture

Testing

Manually built and consumed changes, built installer in runtime and tested to validate behavior.

Risk

Low - we don't expect this to break anything, but it requires coordination across repositories and adds a new component to the installers including a custom action DLL which we didn't previously use.

@github-actions github-actions bot requested a review from Pilchie as a code owner October 6, 2021 20:06
@ghost ghost added the area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework label Oct 6, 2021
@dougbu dougbu added the tell-mode Indicates a PR which is being merged during tell-mode label Oct 6, 2021
@ericstj ericstj self-assigned this Oct 6, 2021
@dougbu dougbu linked an issue Oct 6, 2021 that may be closed by this pull request
@dougbu
Copy link
Contributor

dougbu commented Oct 6, 2021

Thanks for updating the description @ericstj. I ignored that bit given the tell-mode aspect.

@dougbu dougbu enabled auto-merge (squash) October 6, 2021 20:15
@dougbu
Copy link
Contributor

dougbu commented Oct 6, 2021

/fyi I linked this PR to #37290 and enabled auto-squash and merge.

@ericstj
Copy link
Member

ericstj commented Oct 6, 2021

I ignored that bit given the tell-mode aspect.

I don't consider this change tell-mode. The update to the wix dependency was tell, but this is a change to the product installers which I am taking through ask process.

@dougbu dougbu added Servicing-consider Shiproom approval is required for the issue and removed tell-mode Indicates a PR which is being merged during tell-mode labels Oct 6, 2021
@ghost
Copy link

ghost commented Oct 6, 2021

Hi @github-actions[bot]. 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
Copy link
Contributor

dougbu commented Oct 6, 2021

The update to the wix dependency was tell, but this is a change to the product installers which I am taking through ask process.

Fine w/ me. I updated the labels to reflect this.

@dougbu dougbu disabled auto-merge October 6, 2021 20:31
@dougbu
Copy link
Contributor

dougbu commented Oct 6, 2021

Also disabled auto-merge until we hear from @SteveMCarroll

@TanayParikh
Copy link
Contributor

Helix failed due to a known flaky test for 6.0. @HaoK has already fixed this in main so just re-running the test.

Microsoft.AspNetCore.Server.IIS.FunctionalTests.ShadowCopyTests.ShadowCopyCleansUpOlderFolders
Assert.Equal() Failure
          ↓ (pos 0)
Expected: Application Shutting Down
Actual:   Server has been shutdown
          ↑ (pos 0)

@dougbu dougbu added Servicing-approved Shiproom has approved the issue and removed Servicing-consider Shiproom approval is required for the issue labels Oct 6, 2021
@dougbu
Copy link
Contributor

dougbu commented Oct 6, 2021

Approved in email. Re-enabling auto-squishiness.

@dougbu dougbu enabled auto-merge (squash) October 6, 2021 22:19
@dougbu dougbu merged commit 2fddf68 into release/6.0 Oct 6, 2021
@dougbu dougbu deleted the backport/pr-37318-to-release/6.0 branch October 6, 2021 22:57
@ghost ghost added this to the 6.0.0 milestone Oct 6, 2021
ericstj added a commit to ericstj/aspnetcore that referenced this pull request Oct 8, 2021
… 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 <[email protected]>
ericstj added a commit to ericstj/aspnetcore that referenced this pull request Oct 8, 2021
… 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 <[email protected]>
dougbu added a commit that referenced this pull request Oct 11, 2021
* [release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (#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 <[email protected]>

* Update WiX to signed build (#36865)

- #12078

* Update wix to 1.0.0-v3.14.0.5722 (#37329)

Co-authored-by: Eric StJohn <[email protected]>

* [release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#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 #37290

Co-authored-by: Eric StJohn <[email protected]>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
dougbu added a commit that referenced this pull request Oct 11, 2021
* [release/6.0-rc2] Retarget DOTNETHOME when installing x64 on ARM64 (#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 <[email protected]>

* Update WiX to signed build (#36865)

- #12078

* Update wix to 1.0.0-v3.14.0.5722 (#37329)

Co-authored-by: Eric StJohn <[email protected]>

* [release/6.0] Use WIX_NATIVE_MACHINE to detect native architecture of target machine (#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 #37290

Co-authored-by: Eric StJohn <[email protected]>

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Doug Bunting <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-infrastructure Includes: MSBuild projects/targets, build scripts, CI, Installers and shared framework Servicing-approved Shiproom has approved the issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update Microsoft.Signed.WiX to 1.0.0-v3.14.0.5722
3 participants