Skip to content

[6.1.7 Cherry-pick] Address AccessToken and SSPI review feedback - #4643

Merged
paulmedynski merged 2 commits into
release/6.1from
dev/automation/pr-4629-to-6.1.7
Sep 4, 2026
Merged

[6.1.7 Cherry-pick] Address AccessToken and SSPI review feedback#4643
paulmedynski merged 2 commits into
release/6.1from
dev/automation/pr-4629-to-6.1.7

Conversation

@github-actions

@github-actions github-actions Bot commented Sep 3, 2026

Copy link
Copy Markdown

Cherry-pick of #4629 (97d2a21) into release/6.1 failed due to merge conflicts.

Please resolve manually:

git fetch origin
git checkout dev/automation/pr-4629-to-6.1.7
git cherry-pick 97d2a21b0a5802e9259fd04e54815620f74499fb
# resolve conflicts
git push origin dev/automation/pr-4629-to-6.1.7 --force

To resolve, run:  git cherry-pick 97d2a21
@github-actions github-actions Bot added this to the 6.1.7 milestone Sep 3, 2026
@github-project-automation github-project-automation Bot moved this to To triage in SqlClient Board Sep 3, 2026
@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
@benrr101
benrr101 marked this pull request as ready for review September 4, 2026 16:57
@benrr101
benrr101 requested a review from a team as a code owner September 4, 2026 16:57
Copilot AI balanced review requested due to automatic review settings September 4, 2026 16:57
@benrr101

benrr101 commented Sep 4, 2026

Copy link
Copy Markdown
Contributor

/azp run

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
Successfully started running 1 pipeline(s).
2 pipeline(s) were filtered out due to trigger conditions.

@benrr101 benrr101 changed the title [6.1.7 Cherry-pick - CONFLICTS] Address AccessToken and SSPI review feedback [6.1.7 Cherry-pick] Address AccessToken and SSPI review feedback Sep 4, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 Approval recommended

The only finding is a minor punctuation issue that does not affect technical accuracy.

Pull request overview

Clarifies AccessToken documentation for the 6.1 release branch.

Changes:

  • Lists AccessTokenCallback and Credential as mutually exclusive properties.
File summaries
File Description
doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml Expands conflicting-property documentation.
Review details
  • Files reviewed: 1/1 changed files
  • Comments generated: 1
  • Review effort level: Balanced

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml
@paulmedynski paulmedynski moved this from To triage to In review in SqlClient Board Sep 4, 2026
@paulmedynski
paulmedynski enabled auto-merge (squash) September 4, 2026 17:26
@paulmedynski
paulmedynski merged commit e8b34f6 into release/6.1 Sep 4, 2026
278 checks passed
@paulmedynski
paulmedynski deleted the dev/automation/pr-4629-to-6.1.7 branch September 4, 2026 23:53
@github-project-automation github-project-automation Bot moved this from In review to Done in SqlClient Board Sep 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants