This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Merge release/2.1.5xx to release/2.1.6xx #10923
Merged
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
A change to enable the parameterization of the latest known patch numbers for Microsoft.NETCore.App reused the same property names as those in the generated bundled versions props file. When building locally, the stage0 dotnet install was setting the properties first, resulting in older versions as the fallbacks then what is currently being used in the repo. However, when building from an orchestrated build where the properties were being set globally, those properties get respected and the values are the expected ones. This commit fixes this by renaming the properties to those that aren't used in the bundled versions props file. The names chosen match those we're using for the 2.2 builds for consistency.
Prevent stage0 bundled versions from interfering with the build.
peterhuene
approved these changes
Mar 5, 2019
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.
This is an automatically generated pull request from release/2.1.5xx into release/2.1.6xx.
git fetch --all git checkout merges/release/2.1.5xx-to-release/2.1.6xx git reset --hard upstream/release/2.1.6xx git merge upstream/release/2.1.5xx # Fix merge conflicts git commit git push upstream merges/release/2.1.5xx-to-release/2.1.6xx --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.