Move localization to main #49334
Open
Move localization to main #49334
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
There was a problem hiding this comment.
Pull Request Overview
This PR updates the localization branch in the CI pipeline to point at main, enabling early localization integration in the main branch.
- Update CI configuration to use
mainfor localization feeds instead of the locked-downrelease/9.0.3xxbranch.
|
/backport to release/9.0.3xx |
|
Started backporting to release/9.0.3xx: https://github.com/dotnet/sdk/actions/runs/15572100102 |
|
@marcpopMSFT backporting to "release/9.0.3xx" failed, the patch most likely resulted in conflicts: $ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch
Applying: Move localization to main
Using index info to reconstruct a base tree...
M .vsts-ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .vsts-ci.yml
CONFLICT (content): Merge conflict in .vsts-ci.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Move localization to main
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
This was referenced Jun 11, 2025
Open
9.0.3xx is locked down. Let's enable localization in main so we get early net10 loc especially as we moved all our resx files around.
marcpopMSFT
force-pushed
the
marcpopMSFT-locmain
branch
from
9edaeed to
4205628
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
9.0.3xx is locked down. Let's enable localization in main so we get early net10 loc especially as we moved all our resx files around.