Update Find-Dotnet to find dotnet with compat SDK #5341
Merged
Conversation
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
Fix PowerShell#5260 - with this fix folks shouldn't hit the version mismatch check. The approach is to see if the dotnet in the current PATH has a compatible SDK. Folks will have a globall installed dotnet if they've installed VS, VSCode C# ext or have installed the .NET Core SDK. This verion may not have the SDK required by PSCore. And the global cannot see user local dotnet SDK installs. So if the global dotnet doesn't have the right SDK, we prepend the path to the user's local dotnet dir. Also, updateed $dotnetCLIRequiredVersion to read its value from global.json so there is one less source of the truth (for the SDK version).
rkeithhill
requested review from
adityapatwardhan,
daxian-dbw and
TravisEz13
as code owners
iSazonov
reviewed
Nov 5, 2017
| @@ -3,7 +3,7 @@ | |||
| $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator | |||
|
|
|||
| $dotnetCLIChannel = "release" | |||
| $dotnetCLIRequiredVersion = "2.0.2" | |||
| $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version | |||
There was a problem hiding this comment.
Should we stop if global.json does not contain Sdk version?
There was a problem hiding this comment.
It would be highly unusual for global.json to be missing that field since that's about its only purpose.
|
That's great. I found the old behaviour really annoying because every update of |
daxian-dbw
approved these changes
Nov 6, 2017
TravisEz13
approved these changes
Nov 6, 2017
adityapatwardhan
approved these changes
Nov 10, 2017
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.
Fix #5260 - with this fix, folks shouldn't run afoul of the SDK version mismatch check.
Note: the branch name turns out to be a little misleading. Read further.
The approach is to see if the dotnet in the current PATH has a compatible SDK. Folks will have a globally installed dotnet if they've installed VS or have installed the .NET Core SDK themselves. The global dotnet may not have access to the SDK required by PSCore. That is, the global dotnet cannot see user local dotnet SDK installs. So if the global dotnet doesn't have the right SDK, we prepend the path to the user's local dotnet dir.
Also, update $dotnetCLIRequiredVersion to read its value from global.json so there is one less source of the truth (for the SDK version).