Merge dev15.6.x to dev15.6.x-vs-deps#24533
Merged
agocke merged 4 commits intodev15.6.x-vs-depsfrom Jan 30, 2018
Merged
Conversation
…dasmAttribute Fixes #24175
We produce a number of pre-release packages for partner teams to get copies of certain APIs we haven't ratified. We never produce 'stable' versions of those packages because they aren't stable in any meaningful way. But sometimes, you want to mix those pre-release packages and their equivalent stable packages in the same build, which is something that ASP.NET needs to do. This means that we can't use strict package version rules that require exact versions everywhere, or else a 1.2.3-beta1 package will be "incompatible" with 1.2.3 the final release. The easiest fix for this is to change the package dependencies that go from private unofficial packages to official packages as being a "or higher" version requirement, so it works. There's no promise this will work at runtime, but since there's prerelease packages in the mix in the first place there never really was such a promise.
Disable navigate to decompiled sources for assemblies with SuppressIldasmAttribute
…dependency-versioning Fix up some NuGet private package definitions
agocke
approved these changes
Jan 30, 2018
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
4 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.
This is an automatically generated pull request from dev15.6.x into dev15.6.x-vs-deps.
git fetch --all git checkout merges/dev15.6.x-to-dev15.6.x-vs-deps-20180130-080023 git reset --hard upstream/dev15.6.x-vs-deps git merge upstream/dev15.6.x # Fix merge conflicts git commit git push merges/dev15.6.x-to-dev15.6.x-vs-deps-20180130-080023 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.