Repo fixups for NET 5 #1803
Merged
Repo fixups for NET 5 #1803
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
ghost
requested review from
ghost
added
the
vatsan-madhavan
force-pushed
the
dev/vatsan/net5-tfx-fixups
branch
from
bcf3775 to
6441750
Compare
…eworkVersion=v5.0
…is is important for WindowsBase. During conflict resolution, WindowsBase/5.0.0.0 will win over WindowsBase/4.0.0.0 from NetCore.App
vatsan-madhavan
force-pushed
the
dev/vatsan/net5-tfx-fixups
branch
from
6441750 to
220b7e4
Compare
rladuca
reviewed
Sep 7, 2019
rladuca
approved these changes
Sep 7, 2019
|
Next step is to get dotnet/core-setup#7324 synced up and through, but with 3.0 and 3.1 work I don't think I'll get to it for at least another week unless it's critical in some way. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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 #1351, and also includes general fixups that we'd use as a model for getting .NET 3.1 branch up and running.
There is a twin of this PR corresponding to dotnet-wpf-int at https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int/pullrequest/2985?_a=overview
Fixes #1805