Merge branch 'dev/paul/azure/step2' into dev/paul/azure/step3

Author: paulmedynski

CHANGELOG.md

@@ -7,6 +7,87 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 > **Note:** Releases are sorted in reverse chronological order (newest first).
 
+## [Stable release 6.0.5] - 2026-01-15
+
+This update brings the below changes over the previous stable release:
+
+### Fixed
+
+- Fixed NullReferenceException issue with `SqlDataAdapter` when processing batch scenarios where certain SQL RPC calls may not include system parameters.
+  ([#3878](https://github.com/dotnet/SqlClient/pull/3878))
+
+### Added
+
+*What Changed:*
+
+- Added new AppContext switch `Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault` to set `MultiSubnetFailover=true` by default in connection string.
+  ([#3852](https://github.com/dotnet/SqlClient/pull/3852))
+
+*Who Benefits:*
+
+- Applications that need MultiSubnetFailover enabled globally without modifying connection strings.
+
+*Impact:*
+
+- Applications can now enable MultiSubnetFailover globally using one of the following methods:
+
+```c#
+// In application code
+AppContext.SetSwitch("Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault", true);
+```
+
+```json
+// In runtimeconfig.json
+{
+  "configProperties": {
+    "Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault": true
+  }
+}
+```
+
+```xml
+<!-- In App.Config -->
+<runtime>
+  <AppContextSwitchOverrides value="Switch.Microsoft.Data.SqlClient.EnableMultiSubnetFailoverByDefault=true" />
+</runtime>
+```
+
+### Changed
+
+- Updated dependencies ([#3840](https://github.com/dotnet/SqlClient/pull/3840)):
+  - .NET Framework 4.6.2:
+
+    - Azure.Core 1.50.0 - Added
+    - Azure.Identity 1.14.2 -> 1.17.1
+    - Microsoft.Identity.Client 4.80.0 - Added
+    - Microsoft.IdentityModel.JsonWebTokens 7.5.0 -> 7.7.1
+    - Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0 -> 7.7.1
+    - System.Buffers 4.5.1 -> 4.6.1
+    - System.Text.Json 8.0.5 -> 8.0.6
+    - Microsoft.Bcl.Cryptography - Removed
+    - System.Text.Encodings.Web - Removed
+
+  - .NET 8.0:
+
+    - Azure.Core 1.50.0 - Added
+    - Azure.Identity 1.14.2 -> 1.17.1
+    - Microsoft.Identity.Client 4.80.0 - Added
+    - Microsoft.IdentityModel.JsonWebTokens 7.5.0 -> 7.7.1
+    - Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0 -> 7.7.1
+    - Microsoft.Bcl.Cryptography - Removed
+    - System.Text.Json - Removed
+
+  - .NET 9.0:
+
+    - Azure.Core 1.50.0 - Added
+    - Azure.Identity 1.14.2 -> 1.17.1
+    - Microsoft.Extensions.Caching.Memory 9.0.4 -> 9.0.11
+    - Microsoft.Identity.Client 4.80.0 - Added
+    - Microsoft.IdentityModel.JsonWebTokens 7.5.0 -> 7.7.1
+    - Microsoft.IdentityModel.Protocols.OpenIdConnect 7.5.0 -> 7.7.1
+    - Microsoft.Bcl.Cryptography - Removed
+    - System.Text.Json - Removed
+
 ## [Stable Release 6.1.4] - 2026-01-15
 
 This update brings the following changes since the [6.1.3](release-notes/6.1/6.1.3.md) release:

build.proj

@@ -311,6 +311,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <!-- Convert more than one whitespace character into one space -->
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
@@ -331,6 +334,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <!-- Convert more than one whitespace character into one space -->
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
@@ -356,6 +362,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Functional-Windows$(TargetGroup)-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <!-- Convert more than one whitespace character into one space -->
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
@@ -378,6 +387,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Functional-Unixnetcoreapp-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <!-- Convert more than one whitespace character into one space -->
       <TestCommand>$([System.Text.RegularExpressions.Regex]::Replace($(TestCommand), "\s+", " "))</TestCommand>
@@ -407,6 +419,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Manual-Windows$(TargetGroup)-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
     </PropertyGroup>
@@ -432,6 +447,9 @@
         --results-directory $(ResultsDirectory)
         --filter "$(FilterStatement)"
         --logger:"trx;LogFilePrefix=Manual-Unixnetcoreapp-$(TestSet)"
+        --blame-hang
+        --blame-hang-dump-type full
+        --blame-hang-timeout 10m
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
     </PropertyGroup>

eng/dashboards/ado.net-pipelines-ci-builds-by-branch.md

@@ -17,11 +17,11 @@ The branches listed below indicate the repo branch used for the triggered runs.
 |MDS Main CI-Package|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
 |MDS Main CI|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
 |MDS Main CI-Package|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|Yes|Weekdays 01:00 UTC|YAML|
-|MDS 5.1 Servicing|[internal/release/5.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F5.1&_a=contents)|Release|No|Yes|Sunday 08:00 UTC|Classic UI|
 |Test-SqlClient-Kerberos-Azure|[main](https://github.com/dotnet/SqlClient)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI|
 |Test-SqlClient-Kerberos-Azure|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI|
 |Test-SqlClient-Kerberos-Azure|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI|
-|Test-SqlClient-Kerberos-Azure|[release/5.1](https://github.com/dotnet/SqlClient/tree/release/5.1)|Release|No|No|Mon-Fri 07:00 UTC|Classic UI|
 |Test-SqlClient-Managed-Instance|[main](https://github.com/dotnet/SqlClient)|Release|No|No|Daily 03:00 UTC|Classic UI|
 |Test-SqlClient-Managed-Instance|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|No|Daily 03:00 UTC|Classic UI|
 |Test-SqlClient-Managed-Instance|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|No|Daily 03:00 UTC|Classic UI|
+|sni-ci|[master](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient.sni)|Release|Yes|No|Mon 04:30 UTC|YAML|
+|sni-ci|[release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient.sni?path=%2F&version=GBrelease%2F6.0&_a=contents)|Release|Yes|No|Mon 05:30 UTC|YAML|

eng/dashboards/ado.net-pipelines-official-builds.md

@@ -10,7 +10,10 @@ The branches listed below indicate the repo branch used for the triggered runs.
 |Pipeline|Branch|Config|PR Runs|Commit Runs|Scheduled Runs|Source|
 |-|-|-|-|-|-|-|
 |dotnet-sqlclient-Official|[internal/main](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient)|Release|No|No|Mon-Fri 03:30 UTC, Sun 04:30 UTC|YAML|
-|Microsoft.Data.SqlClient.sni-Official|[master](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient.sni)|Release|No|Yes|Mon-Fri 23:00 UTC, Sun 04:00 UTC|YAML|
+|dotnet-sqlclient-Official|[internal/release/6.1](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.1&_a=contents)|Release|No|No|Mon 05:00 UTC|YAML|
+|dotnet-sqlclient-Official|[internal/release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/dotnet-sqlclient?path=%2F&version=GBinternal%2Frelease%2F6.0&_a=contents)|Release|No|No|Mon 05:00 UTC|YAML|
+|Microsoft.Data.SqlClient.sni-Official|[master](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient.sni)|Release|No|Yes|Sat 04:30 UTC|YAML|
+|Microsoft.Data.SqlClient.sni-Official|[release/6.0](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient.sni?path=%2F&version=GBrelease%2F6.0&_a=contents)|Release|No|Yes|Sat 05:30 UTC|YAML|
 |akv-official|N/A|Release|No|No|No|YAML|
 |mds-official|N/A|Release|No|No|TBD|YAML|
 |Localization-CI|[master](https://sqlclientdrivers.visualstudio.com/ADO.Net/_git/Microsoft.Data.SqlClient), [main](https://github.com/dotnet/SqlClient)|Release|No|No|Daily 19:00 UTC|Classic UI|

eng/dashboards/public-pipelines-ci-builds-by-branch.md

@@ -20,4 +20,3 @@ PR pipelines run on the topic branch associated to the PR.
 |CI-SqlClient-Package|[release/6.1](https://github.com/dotnet/SqlClient/tree/release/6.1)|Release|No|Yes|Sunday 04:30 UTC|YAML|
 |CI-SqlClient|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:00 UTC|YAML|
 |CI-SqlClient-Package|[release/6.0](https://github.com/dotnet/SqlClient/tree/release/6.0)|Release|No|Yes|Sunday 06:30 UTC|YAML|
-|Release 5.1|[release/5.1](https://github.com/dotnet/SqlClient/tree/release/5.1)|Release|Yes|Yes|Sunday 08:00 UTC|Classic UI|

eng/pipelines/common/templates/jobs/ci-run-tests-job.yml

@@ -328,7 +328,7 @@ jobs:
         abstractionsPackageVersion: ${{ parameters.abstractionsPackageVersion }}
         mdsPackageVersion: ${{ parameters.mdsPackageVersion }}
 
-  - ${{ if and(eq(parameters.publishTestResults, true), eq(parameters.referenceType, 'Project')) }}: # publish test results if build type is project
+  - ${{ if eq(parameters.publishTestResults, true) }}:
     - template: /eng/pipelines/common/templates/steps/publish-test-results-step.yml@self
       parameters:
         debug: ${{ parameters.debug }}

eng/pipelines/common/templates/steps/build-and-run-tests-netcore-step.yml

@@ -62,6 +62,7 @@ steps:
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Functional Tests for ${{parameters.TargetNetCoreVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
@@ -76,9 +77,13 @@ steps:
       --no-build
       -v n
       --filter "category!=failing&category!=flaky"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Flaky Functional Tests for ${{parameters.TargetNetCoreVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
@@ -93,10 +98,14 @@ steps:
       --no-build
       -v n
       --filter "category=flaky"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Manual Tests for ${{parameters.TargetNetCoreVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
@@ -112,10 +121,14 @@ steps:
       -v n
       --filter "category!=failing&category!=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Flaky Manual Tests for ${{parameters.TargetNetCoreVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
@@ -131,5 +144,8 @@ steps:
       -v n
       --filter "category=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
   continueOnError: true

eng/pipelines/common/templates/steps/build-and-run-tests-netfx-step.yml

@@ -62,6 +62,7 @@ steps:
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Functional Tests for ${{parameters.TargetNetFxVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
@@ -77,9 +78,13 @@ steps:
       -v n
       --filter "category!=failing&category!=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Flaky Functional Tests for ${{parameters.TargetNetFxVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\FunctionalTests\Microsoft.Data.SqlClient.FunctionalTests.csproj'
@@ -95,10 +100,14 @@ steps:
       -v n
       --filter "category=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   continueOnError: true
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Manual Tests for ${{parameters.TargetNetFxVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
@@ -114,10 +123,14 @@ steps:
       -v n
       --filter "category!=failing&category!=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
 
 - task: DotNetCoreCLI@2
   displayName: 'Run Flaky Manual Tests for ${{parameters.TargetNetFxVersion }}'
+  condition: succeededOrFailed()
   inputs:
     command: test
     projects: 'src\Microsoft.Data.SqlClient\tests\ManualTests\Microsoft.Data.SqlClient.ManualTesting.Tests.csproj'
@@ -133,5 +146,8 @@ steps:
       -v n
       --filter "category=flaky"
       --collect "Code Coverage"
+      --blame-hang
+      --blame-hang-dump-type full
+      --blame-hang-timeout 10m
   retryCountOnTaskFailure: ${{parameters.retryCountOnManualTests }}
   continueOnError: true

eng/pipelines/common/templates/steps/configure-sql-server-step.yml

@@ -103,6 +103,7 @@ steps:
 - task: DotNetCoreCLI@2
   displayName: 'Build Ext Utilities'
   inputs:
+    command: build
     arguments: '-f ${{parameters.netcoreVersionTestUtils }}'
     workingDirectory: src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.ExtUtilities
   retryCountOnTaskFailure: 1

eng/pipelines/common/templates/steps/esrp-code-signing-step.yml

@@ -52,7 +52,7 @@ steps:
       EsrpClientId: '${{parameters.EsrpClientId }}'
       UseMSIAuthentication: true
       FolderPath: '${{parameters.sourceRoot }}'
-      Pattern: '*.dll'
+      Pattern: 'Microsoft.Data.SqlClient*.dll'
       CleanupTempStorage: 1
       VerboseLogin: 1
   - task: EsrpCodeSigning@5
@@ -66,7 +66,7 @@ steps:
       AuthAKVName: '${{parameters.AuthAKVName }}'
       AuthSignCertName: '${{parameters.AuthSignCertName }}'
       FolderPath: '${{parameters.sourceRoot }}'
-      Pattern: '*.dll'
+      Pattern: 'Microsoft.Data.SqlClient*.dll'
       signConfigType: inlineSignParams
       inlineOperation: |
           [