-
Notifications
You must be signed in to change notification settings - Fork 8k
Allow multiple installations of dotnet. #17141
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
Conversation
|
We should consider this for backport to avoid extra work in fixing local mac dev machines, but we should get at least one preview release. |
A new flag for removal is now provided, but by default we will add a new version of dotnet.
c0b59b1 to
095e203
Compare
|
This PR has Quantification details
Why proper sizing of changes matters
Optimal pull request sizes drive a better predictable PR flow as they strike a
What can I do to optimize my changes
How to interpret the change counts in git diff output
Was this comment helpful? 👍 :ok_hand: :thumbsdown: (Email) |
This is the same fix as PowerShell/PowerShell#17141
|
/backport to release/v7.2.4 |
|
Started backporting to release/v7.2.4: https://github.com/PowerShell/PowerShell/actions/runs/2242321819
|
|
/backport to release/v7.0.11 |
|
Started backporting to release/v7.0.11: https://github.com/PowerShell/PowerShell/actions/runs/2295866950
|
|
@TravisEz13 backporting to release/v7.0.11 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Allow multiple installations of dotnet.
Using index info to reconstruct a base tree...
M build.psm1
Falling back to patching base and 3-way merge...
Auto-merging build.psm1
CONFLICT (content): Merge conflict in build.psm1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Allow multiple installations of dotnet.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
Have Jim do the backport once we open the 7.0.12 branch. This is not required. |
|
🎉 Handy links: |
This is the same fix as PowerShell/PowerShell#17141
|
/backport to release/v7.0.12 |
|
Not needed for release. This makes working on mac easier, no effect during the release process |
A new flag for removal is now provided, but by default we will add a new version of dotnet.
PR Summary
This adds the proper flag to not damage a new installation of dotnet if one exists.
Additionally, we will no longer automatically delete previous versions of dotnet. Previous versions of dotnet may still be removed by using the new
-RemovePreviousVersionparameter ofInstall-DotnetPR Context
Current
install-dotnetwill break dotnet use if another version already exists. This PR adds the-skipnonversionedfilesparameter when callingdotnet-installwhich avoids this behavior.PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:or[ WIP ]to the beginning of the title (theWIPbot will keep its status check atPendingwhile the prefix is present) and remove the prefix when the PR is ready.(which runs in a different PS Host).