Remove unresolved merge conflict markers from Directory.Packages.props - #861
Open
SimonCropp wants to merge 1 commit into
Open
SimonCropp wants to merge 1 commit into
SimonCropp wants to merge 1 commit into
Conversation
The ec875a1 merge left conflict markers in place, which broke central package version resolution and failed restore with NU1015 for every project referencing an affected package.
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
1 participant
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.
Summary
Directory.Packages.propsNU1015restore failures forSample,WinFormsAppTests, andWpfAppTests(every package they reference showed up as "no version specified")Microsoft.NET.Test.Sdkaddition from the losing side of the conflict since nothing in the repo references that package (consistent with the earlier migration to Microsoft.Testing.Platform)Test plan
dotnet build --configuration Releasesucceeds locally with 0 errors