[6.0] Fixing NullReferenceException issue with SqlDataAdapter #3850
+301
−2
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
...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
Outdated
Show resolved
Hide resolved
...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
Outdated
Show resolved
Hide resolved
Removed SqlDataAdapterBatchUpdateTests from the project file.
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.
Comments suppressed due to low confidence (2)
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj:278
- The test file SqlDataAdapterBatchUpdateTests.cs is included twice in the project file. The first inclusion at line 16 is within a conditional ItemGroup for Always Encrypted tests, while the second inclusion at line 278 is in an unconditional ItemGroup. This duplication will cause build warnings or errors. Remove one of these duplicate entries - preferably keep only the conditional one at line 16 since this is an Always Encrypted test.
<Compile Include="DataCommon\AADUtility.cs" />
src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj:392
- This empty Folder ItemGroup appears to be unnecessary. The folder path 'microsoft.data.sqlclient\tests\manualtests\alwaysencrypted' seems incorrectly cased and doesn't provide any functional value. Modern SDK-style projects automatically include folders based on their file contents. Consider removing this ItemGroup.
...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs
Show resolved
Hide resolved
...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs
Show resolved
Hide resolved
...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs
Show resolved
Hide resolved
...Microsoft.Data.SqlClient/tests/ManualTests/AlwaysEncrypted/SqlDataAdapterBatchUpdateTests.cs
Show resolved
Hide resolved
apoorvdeshmukh
previously approved these changes
Dec 16, 2025
apoorvdeshmukh
approved these changes
Dec 16, 2025
paulmedynski
approved these changes
Dec 16, 2025
apoorvdeshmukh
requested changes
Dec 17, 2025
Contributor
apoorvdeshmukh
left a comment
apoorvdeshmukh
left a comment
There was a problem hiding this comment.
Test needs to be fixed in main first and then changes need to be ported here.
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.
Ports #3749 to release/6.1 branch
Closes #3848