csproj fixes after merges #272
Merged
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
1. Move JetBrains.Annotations from Directory.Build.props to csproj
Updating this is more complicated inside the props file. Move it back
to csproj to make updating easier.
2. Consolidate PropertyGroup in X.PagedList.csproj
3. Whitespace fixes
4. Remove icon.png include in X.PagedList.csproj
This is already in Directory.Build.props
This removes duplicated/redundant lines due to merges.
|
That's why I prefer rebase to merging. Merging frequently breaks something if one branch is sufficiently older than the other. ;-) |
Update Microsoft.EntityFrameworkCore for all frameworks and restrict maximum version for net6.0.
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.
See individual commits. Only tidying up, no functional changes.