[7.0.3 Cherry-pick] Address AccessToken and SSPI review feedback - #4644
Merged
Conversation
To resolve, run: git cherry-pick 97d2a21
|
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>
cheenamalhotra
changed the title
benrr101
marked this pull request as ready for review
September 4, 2026 16:53
benrr101
approved these changes
Sep 4, 2026
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
The reviewed backport has no unresolved approval-blocking issues.
Pull request overview
Backports AccessToken and SSPI conflict-handling improvements to the release/7.0 branch.
Changes:
- Unifies conflicting AccessToken/SSPI exception messages.
- Tests all assignment orders.
- Documents properties incompatible with
AccessToken.
File summaries
| File | Description |
|---|---|
src/Microsoft.Data.SqlClient/tests/UnitTests/SimulatedServerTests/ConnectionTests.cs |
Verifies consistent conflict messages. |
src/Microsoft.Data.SqlClient/src/Resources/Strings.resx |
Defines the unified error message. |
src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs |
Updates the generated resource accessor. |
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/SqlConnection.cs |
Uses the unified conflict exception. |
src/Microsoft.Data.SqlClient/src/Microsoft/Data/Common/AdapterUtil.cs |
Consolidates exception construction. |
doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml |
Expands AccessToken conflict documentation. |
Review details
Files not reviewed (1)
- src/Microsoft.Data.SqlClient/src/Resources/Strings.Designer.cs: Generated file
- Files reviewed: 5/6 changed files
- Comments generated: 0
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
paulmedynski
approved these changes
Sep 4, 2026
paulmedynski
enabled auto-merge (squash)
September 4, 2026 17:26
cheenamalhotra
disabled auto-merge
September 4, 2026 19:27
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 #4629 (97d2a21) into
release/7.0.Conflict was in
Strings.Designer.cs:release/7.0still had the oldADP_InvalidMixedUsageOfAccessTokenAndSspiContextProviderandADP_InvalidMixedUsageOfSspiContextProviderAndAccessTokenentries. Both are replaced by the singleADP_InvalidMixedUsageOfAccessTokenPropertiesstring, matching the source commit.Resulting diff is identical to #4629.