-
Couldn't load subscription status.
- Fork 2k
Re-apply internal staging versions of .NET in sync-internal-release command #6699
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
…ranch" variable instead of SourceBranch for determining repo lineage
|
The biggest change from the last ~3 commits has to do with the The "source" branch (or "upstream" branch) is just a property of the repo. For example, our The various update-dependencies can now just read it from the manifest variables directly instead of taking it as an argument, which frees up I actually already made this change when working on dotnet/docker-tools#1813 to simplify things. There will need to be a little bit of cleanup in various scripts that still override the branch variable when generating dockerfiles/readmes. |
|
|
||
| // AzdoOrganization is a URL like https://dev.azure.com/<org> | ||
| // A valid Azure DevOps repository URL is formatted like https://dev.azure.com/<org>/<project>/_git/<repo> | ||
| return $"{options.AzdoOrganization.TrimEnd('/')}/{options.AzdoProject}/_git/{options.AzdoRepo}"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This shares the same logic as SyncInternalReleaseCommand.ExecuteAsync. It'd be nice if there was one method to format this URL.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made sure that SpecificCommand and SyncInternalReleaseCommand both use the extension method. Also centralized the trimming into the options class.
This is the biggest part of https://github.com/dotnet/dotnet-docker-internal/issues/6741. The functionality added in this PR ensures that the internal/release/* branch can be updated with the state of the release/* branch even when the two branches diverge.
I have attempted to make commits reviewable individually.