[7.0.3 Cherry-pick] [Scheduled Run] Localized resource files from OneLocBuild - #4649
Merged
Merged
Conversation
To resolve, run: git cherry-pick 92eb8b4
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
Member
|
Closing as not applicable to release/7.0. The localization commit replaces two resource keys with ADP_InvalidMixedUsageOfAccessTokenProperties, but release/7.0 still uses the two original keys and its localized files contain neither entry. Resolving with the release versions produces no changes. |
Keep the release-specific resource keys because the consolidated key from main is not used on release/7.0. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
cheenamalhotra
changed the title
benrr101
marked this pull request as ready for review
September 8, 2026 17:26
Contributor
There was a problem hiding this comment.
Copilot wasn't able to review any files in this pull request.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Contributor
|
/azp run |
|
Azure Pipelines: 2 pipeline(s) were filtered out due to trigger conditions. |
Member
|
There are no file changes here. The parent PR needs to be re-ported. |
…/pr-4645-to-7.0.3
Co-authored-by: SqlClient DevOps <sqlclient@microsoft.com>
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com> Copilot-Session: ae45d307-0fee-44fd-a531-f67a8558aee5
mdaigle
approved these changes
Sep 9, 2026
mdaigle
left a comment
mdaigle
left a comment
Contributor
There was a problem hiding this comment.
Approving with the understanding that the translations will also be back ported.
priyankatiwari08
approved these changes
Sep 9, 2026
Contributor
|
/azp run |
paulmedynski
enabled auto-merge (squash)
September 9, 2026 15:09
|
Azure Pipelines: Successfully started running 2 pipeline(s). 1 pipeline(s) were filtered out due to trigger conditions. |
paulmedynski
approved these changes
Sep 9, 2026
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
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.
Cherry-pick of #4645 (92eb8b4) into
release/7.0.\n\nResolved the localized resource conflicts after #4644 added the consolidatedADP_InvalidMixedUsageOfAccessTokenPropertieskey to release/7.0.