Don't run _HandlePackageFileConflicts target if there are no references #3912
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
|
This should go for 3.1.2xx at this point right? |
|
@livarcocc Yes, but we don't have that branch yet :-) |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
nguerrera
reviewed
Dec 16, 2019
| @@ -25,7 +25,8 @@ Copyright (c) .NET Foundation. All rights reserved. | |||
| <Target Name="_HandlePackageFileConflicts" | |||
| BeforeTargets="$(_HandlePackageFileConflictsBefore)" | |||
| AfterTargets="$(_HandlePackageFileConflictsAfter)" | |||
| DependsOnTargets="GetFrameworkPaths;GetReferenceAssemblyPaths"> | |||
| DependsOnTargets="GetFrameworkPaths;GetReferenceAssemblyPaths" | |||
| Condition="'@(Reference)' != '' Or '@(ReferencePath)' != ''"> | |||
There was a problem hiding this comment.
It feels wrong that this conditions on ReferencePath but doesn't use ReferencePath.
dsplaisted
force-pushed
the
CppPackageFileConflicts
branch
from
3f44ec8
to
81037da
Compare
|
@nguerrera @livarcocc I pushed an update based on Nick's feedback. One of you may want to merge this assuming the tests pass. |
nguerrera
approved these changes
Dec 19, 2019
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.
Fixes #3585