Skip to content

Conversation

@joeloff
Copy link
Member

@joeloff joeloff commented Oct 5, 2021

Fixes #12246

@joeloff joeloff requested review from dsplaisted and sfoslund October 5, 2021 20:34
Copy link
Member

@dsplaisted dsplaisted left a comment

Choose a reason for hiding this comment

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

Any reason the version number is duplicated across 2 files?

@joeloff
Copy link
Member Author

joeloff commented Oct 5, 2021

Any reason the version number is duplicated across 2 files?

The zip and nupkg used to be versioned differently. Let me see if we can fix that up.

@joeloff joeloff merged commit 46fa4c3 into dotnet:release/6.0.1xx Oct 5, 2021
@joeloff joeloff deleted the wix3145722 branch October 5, 2021 22:51
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>

* Permit installation of ARM64 SDK

* Only block installing x64 SDK on ARM64

Co-authored-by: Jacques Eloff <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants