Update WiX to 3.14.0.5722#12252
Merged
joeloff merged 2 commits intodotnet:release/6.0.1xxfrom Oct 5, 2021
Merged
Conversation
dsplaisted
approved these changes
Oct 5, 2021
Member
dsplaisted
left a comment
There was a problem hiding this comment.
Any reason the version number is duplicated across 2 files?
Member
Author
The zip and nupkg used to be versioned differently. Let me see if we can fix that up. |
ericstj
pushed a commit
to ericstj/installer
that referenced
this pull request
Oct 6, 2021
ericstj
pushed a commit
to ericstj/installer
that referenced
this pull request
Oct 6, 2021
ericstj
pushed a commit
to ericstj/installer
that referenced
this pull request
Oct 9, 2021
ericstj
pushed a commit
to ericstj/installer
that referenced
this pull request
Oct 9, 2021
ericstj
added a commit
that referenced
this pull request
Oct 11, 2021
* Remove writing InstallLocation from SDK, it will be handled by host * Update WiX to signed build (#12078) # Conflicts: # eng/Versions.props # src/finalizer_shim/finalizer_shim.csproj * Update WiX to 3.14.0.5722 (#12252) * Add installation checks to prevent install on ARM64 * Update wording of blockers * Ensure we allow specifying DOTNETALLOWINSTALLONARM64 Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
ericstj
added a commit
that referenced
this pull request
Oct 11, 2021
* Remove writing InstallLocation from SDK, it will be handled by host * Update WiX to signed build (#12078) # Conflicts: # eng/Versions.props # src/finalizer_shim/finalizer_shim.csproj * Update WiX to 3.14.0.5722 (#12252) * Add installation checks to prevent install on ARM64 * Update wording of blockers * Ensure we allow specifying DOTNETALLOWINSTALLONARM64 Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
ericstj
added a commit
to ericstj/installer
that referenced
this pull request
Oct 22, 2021
* Remove writing InstallLocation from SDK, it will be handled by host * Update WiX to signed build (dotnet#12078) # Conflicts: # eng/Versions.props # src/finalizer_shim/finalizer_shim.csproj * Update WiX to 3.14.0.5722 (dotnet#12252) * Add installation checks to prevent install on ARM64 * Update wording of blockers * Ensure we allow specifying DOTNETALLOWINSTALLONARM64 Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
ericstj
added a commit
that referenced
this pull request
Oct 25, 2021
* [release/5.0.4xx] Backport x64 on ARM64 installer changes (#12278) * Remove writing InstallLocation from SDK, it will be handled by host * Update WiX to signed build (#12078) # Conflicts: # eng/Versions.props # src/finalizer_shim/finalizer_shim.csproj * Update WiX to 3.14.0.5722 (#12252) * Add installation checks to prevent install on ARM64 * Update wording of blockers * Ensure we allow specifying DOTNETALLOWINSTALLONARM64 Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com> * Permit installation of ARM64 SDK * Only block installing x64 SDK on ARM64 Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #12246