Adding detection and retargeting of DOTNETHOME #7785
Merged
Conversation
This file contains 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
When x64 is installed on non-x64 machine, place in an x64 subdirectory.
|
Runtime side of changes: dotnet/runtime#58059 |
joeloff
reviewed
Aug 24, 2021
src/Microsoft.DotNet.Build.Tasks.Workloads/src/GenerateManifestMsi.cs
Outdated
Show resolved
Hide resolved
ericstj
force-pushed
the
ericstj/x64onARM64
branch
from
1589f3c
to
f927eb5
Compare
ericstj
force-pushed
the
ericstj/x64onARM64
branch
from
f927eb5
to
ffecbc5
Compare
Don't need to use a registry search since environment of the MSIServer process can be read (TBD pending reccomendation from MSI team). Also make property work for any architecture, in case we wish to use it more generically (EG: to condition PATH entry in host installer).
|
I'd like to start merging these pull-requests into MAIN and working up the stack. We'll validate the scenario using the installers in main, then port to 6.0. |
ericstj
commented
Sep 2, 2021
ericstj
commented
Sep 2, 2021
src/Microsoft.DotNet.Build.Tasks.Workloads/src/MsiTemplate/Registry.wxs
Outdated
Show resolved
Hide resolved
ericstj
commented
Sep 2, 2021
| <!-- Identify when installing in emulation as when PROCESSOR_ARCHITECTURE does not match the installer architecture | ||
| https://docs.microsoft.com/en-us/windows/win32/winprog64/wow64-implementation-details --> | ||
| <SetProperty Action="Set_INSTALLING_IN_EMULATION" Id="INSTALLING_IN_EMULATION" Value="true" Before="CostFinalize"> | ||
| NOT %PROCESSOR_ARCHITECTURE="$(var.InstallerArchitecture)" |
There was a problem hiding this comment.
Once we have wixtoolset/issues#6556 this goes away.
There was a problem hiding this comment.
We'll need to port this into release/6.0 as well I think since Arcade snapped and main now targets 7.0
FYI @pjcollins this will impact maui workload pack generation
There was a problem hiding this comment.
We'll need to port this into release/6.0
Right, that's the plan here: #7785 (comment)
joeloff
reviewed
Sep 3, 2021
joeloff
reviewed
Sep 3, 2021
src/Microsoft.DotNet.Build.Tasks.Installers/build/wix/product/product.wxs
Outdated
Show resolved
Hide resolved
joeloff
reviewed
Sep 3, 2021
src/Microsoft.DotNet.Build.Tasks.Workloads/src/Microsoft.DotNet.Build.Tasks.Workloads.csproj
Show resolved
Hide resolved
joeloff
reviewed
Sep 3, 2021
ericstj
added a commit
to ericstj/arcade
that referenced
this pull request
Sep 17, 2021
* Adding detection and retargeting of DOTNETHOME When x64 is installed on non-x64 machine, place in an x64 subdirectory. * Remove test value of dotnet folder * Fix ProgramFilesFolder preprocessor variable usage * Refactor Set_DOTNETHOME_x64 into a single shared source file * Add CA ID for INSTALLING_IN_EMULATION. * Define Platform consistently * Move workload registration to platform specific * Refactor INSTALLING_IN_EMULATION property Don't need to use a registry search since environment of the MSIServer process can be read (TBD pending reccomendation from MSI team). Also make property work for any architecture, in case we wish to use it more generically (EG: to condition PATH entry in host installer). * Make platform comparison case insensitive * Respond to feedback
1 task
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
When x64 is installed on non-x64 machine, place in an x64 subdirectory.
This is still a WIP. We could share this with both Installers and workloads SDK, perhaps with just a common source file. I'd also like to better understand once putting together some consumption PRs upstack.