This repository was archived by the owner on Apr 20, 2023. It is now read-only.
Trigger build with unambiguous commit height#8660
Merged
nguerrera merged 11 commits intodotnet:release/2.1.1xxfrom Feb 22, 2018
Merged
Trigger build with unambiguous commit height#8660nguerrera merged 11 commits intodotnet:release/2.1.1xxfrom
nguerrera merged 11 commits intodotnet:release/2.1.1xxfrom
Conversation
dsplaisted
approved these changes
Feb 22, 2018
Contributor
Author
|
@MattGertz FYI. Infrastucture only. Changes build number to get around the conflict I mentioned in email, but does not change a single line of code or the versions of any components. |
|
Groovy, understood, thanks. |
livarcocc
approved these changes
Feb 22, 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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
The release/2.1.2xx had a few builds where it still had 2.1.100 branding. This causes 2.1.1xx builds to fail because they conflict with what 2.1.2xx published. Worse, the 2.1.2xx-produced builds look like they are 2.1.100 builds but have an inappropriate payload -- for example, a 4.7/15.7 daily build of nuget.
We are going to be discussing moving away from commit height versioning tomorrow, but we need a build tonight that is suitable for inserting into Visual Studio tomorrow morning. So, as a workaround, this adds enough commits to get a version that is greater than any of the phony 2.1.100 builds that were produced out of the wrong branch. We also need to have a better process for updating branding whenever a release branch is created.
For obvious reasons, do not squash this when merging.