C#: Fix global.json and packages.config lookup
#16312
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
| @@ -143,7 +143,7 @@ private static BuildScript DownloadDotNet(IBuildActions actions, ILogger logger, | |||
| // See https://docs.microsoft.com/en-us/dotnet/core/tools/global-json | |||
| var versions = new List<string>(); | |||
|
|
|||
| foreach (var path in files.Where(p => p.EndsWith("global.json", StringComparison.Ordinal))) | |||
| foreach (var path in files.Where(p => p.EndsWith(Path.DirectorySeparatorChar + "global.json", StringComparison.Ordinal))) | |||
There was a problem hiding this comment.
Did you run into a case where a file was name myglobal.json or something similar?
nit: Maybe consider using Path.GetFileName? (same comment for the other similar change)
There was a problem hiding this comment.
Thanks for suggesting Path.GetFileName, that handles two other cases too. I'll change it...
I was putting together an integration test, and temporarily renamed the packages.config to x_packages.config, and then I was surprised that the packages were still picked up by the dependency manager.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
Comment on lines
+206
to
+210
| catch (Exception ex) | ||
| { | ||
| logger.LogDebug($"Failed to get directory name for {path}: {ex.Message}"); | ||
| return ""; | ||
| } |
Check notice
Code scanning / CodeQL
Generic catch clause
Comment on lines
+219
to
+223
| catch (Exception ex) | ||
| { | ||
| logger.LogDebug($"Failed to get file name for {path}: {ex.Message}"); | ||
| return null; | ||
| } |
Check notice
Code scanning / CodeQL
Generic catch clause
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.
No description provided.