Respect deps.json part 2#7594
Merged
Merged
Conversation
Co-Authored-By: Forgind <Forgind@users.noreply.github.com>
rainersigwald
left a comment
Member
There was a problem hiding this comment.
Have you validated this code against the NuGet workflow that failed?
cc @baronfel
| { | ||
| _directory = Directory.GetParent(assemblyPath)!.FullName; | ||
|
|
||
| _resolver = File.Exists(assemblyPath) && File.Exists(Path.Combine(_directory, Path.GetFileNameWithoutExtension(assemblyPath) + ".deps.json")) |
Member
There was a problem hiding this comment.
Suggested change
| _resolver = File.Exists(assemblyPath) && File.Exists(Path.Combine(_directory, Path.GetFileNameWithoutExtension(assemblyPath) + ".deps.json")) | |
| _resolver = File.Exists(assemblyPath) && File.Exists(Path.ChangeExtension(assemblyPath, ".deps.json")) |
?
Contributor
Author
There was a problem hiding this comment.
Beautiful and much nicer than my ugly thing 👍
| { | ||
| _directory = Directory.GetParent(assemblyPath)!.FullName; | ||
|
|
||
| _resolver = File.Exists(assemblyPath) && File.Exists(Path.Combine(_directory, Path.GetFileNameWithoutExtension(assemblyPath) + ".deps.json")) |
Member
There was a problem hiding this comment.
Comment both parts of this condition, please?
rainersigwald
approved these changes
May 4, 2022
Member
|
Oh and let's make sure to squash this before merge; the commit history is super confusing with the revert. |
Contributor
Author
Do you mean make sure to use squash and merge when merging, or that I should rebase this into a few interesting commits? |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Fixes #4081
Context
See #7520
Changes Made
Added looking for a .deps.json
Testing
Found one case when it seemed to discard an assembly without a .deps.json and one when it seemed to include it. (Not extensive)