Merge branch 'main' into public

Author: benrr101

.editorconfig

@@ -14,6 +14,9 @@ indent_size = 4
 [*.{json,jsonc}]
 indent_size = 2
 
+[*.{yml,yaml}]
+indent_size = 2
+
 # C# files
 [*.cs]
 # New line preferences
@@ -32,6 +35,9 @@ csharp_indent_case_contents = true
 csharp_indent_switch_labels = true
 csharp_indent_labels = one_less_than_current
 
+# Require braces around if/for/while/etc
+csharp_prefer_braces = true:warning
+
 # avoid this. unless absolutely necessary
 dotnet_style_qualification_for_field = false:suggestion
 dotnet_style_qualification_for_property = false:suggestion
@@ -43,6 +49,9 @@ csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = false:none
 csharp_style_var_elsewhere = false:suggestion
 
+# don't prefer the range operator, netfx doesn't have these types
+csharp_style_prefer_range_operator = false
+
 # use language keywords instead of BCL types
 dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
 dotnet_style_predefined_type_for_member_access = true:suggestion
@@ -152,23 +161,13 @@ dotnet_code_quality.CA2100.excluded_type_names_with_derived_types = Microsoft.Da
 dotnet_diagnostic.xUnit1031.severity=none
 dotnet_diagnostic.xUnit1030.severity=none
 
-[*.{csproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
-indent_size = 2
-
-# Xml build files
-[*.builds]
-indent_size = 2
-
 # Xml files
-[*.{xml,stylecop,resx,ruleset}]
-indent_size = 2
-
-# Xml config files
-[*.{props,targets,config,nuspec}]
+[*.{xml,csproj,stylecop,resx,ruleset,props,targets,config,nuspec}]
 indent_size = 2
 
 # Shell scripts
 [*.sh]
 end_of_line = lf
+
 [*.{cmd, bat}]
 end_of_line = crlf

CHANGELOG.md

@@ -4,11 +4,176 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-# Release Notes
+## [Stable Release 6.1.2] - 2025-10-07
+
+This update brings the below changes over the previous stable release:
+
+### Fixed
+
+- Fixed an issue where initializing PerformanceCounters would throw `System.InvalidOperationException` [#3629](https://github.com/dotnet/sqlclient/pull/3629)
+- Fixed an issue where a Custom SqlClientAuthenticationProvider was being overwritten by default implementation. [#3651](https://github.com/dotnet/SqlClient/pull/3651)
+- Fixed a concurrency issue in connection pooling where the number of active connections could be lower than the configured maximum pool size. [#3653](https://github.com/dotnet/SqlClient/pull/3653)
+
+## [Stable release 6.0.3] - 2025-10-07
+
+This update brings the below changes over the previous stable release:
+
+### Fixed
+
+- Fixed an issue where a Custom SqlClientAuthenticationProvider was being overwritten by default implementation. [#3652](https://github.com/dotnet/SqlClient/pull/3652)
+- Fixed a concurrency issue in connection pooling where the number of active connections could be lower than the configured maximum pool size. [#3654](https://github.com/dotnet/SqlClient/pull/3654)
+
+### Changed
+
+- Updated MSAL usage as per code compliance requirements [#3360](https://github.com/dotnet/SqlClient/pull/3360)
+- Updated `SqlDecimal` implementation to improve code compliance [#3466](https://github.com/dotnet/SqlClient/pull/3466)
+- Updated Azure.Identity and related dependencies [#3553](https://github.com/dotnet/SqlClient/pull/3553)
+
+## [Preview Release 7.0.0-preview1.25257.1] - 2025-09-12
+
+This update brings the following changes since the [6.1.0](release-notes/6.1/6.1.0.md)
+release:
+
+### Breaking Changes
+
+- Removed `Constrained Execution Region` error handling blocks and associated
+  `SqlConnection` cleanup which may affect how potentially-broken connections
+  are expunged from the pool.
+  ([#3535](https://github.com/dotnet/SqlClient/pull/3535))
+
+### Bug Fixes
+
+- Packet multiplexing disabled by default, and several bug fixes.
+  ([#3534](https://github.com/dotnet/SqlClient/pull/3534),
+   [#3537](https://github.com/dotnet/SqlClient/pull/3537))
+
+### Added
+
+- `SqlColumnEncryptionCertificateStoreProvider` now works on Windows, Linux,
+  and macOS.
+  ([#3014](https://github.com/dotnet/SqlClient/pull/3014))
+
+### Changed
+
+- Updated `SqlVector.Null` to return a nullable `SqlVector` instance in the
+  reference API to match the implementation.
+  ([#3521](https://github.com/dotnet/SqlClient/pull/3521))
+
+- Performance improvements for all built-in
+  `SqlColumnEncryptionKeyStoreProvider` implementations.
+  ([#3554](https://github.com/dotnet/SqlClient/pull/3554))
+
+- Various test improvements.
+  ([#3456](https://github.com/dotnet/SqlClient/pull/3456),
+   [#2968](https://github.com/dotnet/SqlClient/pull/2968),
+   [#3458](https://github.com/dotnet/SqlClient/pull/3458),
+   [#3494](https://github.com/dotnet/SqlClient/pull/3494),
+   [#3559](https://github.com/dotnet/SqlClient/pull/3559),
+   [#3575](https://github.com/dotnet/SqlClient/pull/3575))
+
+- Codebase merge project and related cleanup.
+  ([#3436](https://github.com/dotnet/SqlClient/pull/3436),
+   [#3434](https://github.com/dotnet/SqlClient/pull/3434),
+   [#3448](https://github.com/dotnet/SqlClient/pull/3448),
+   [#3454](https://github.com/dotnet/SqlClient/pull/3454),
+   [#3462](https://github.com/dotnet/SqlClient/pull/3462),
+   [#3435](https://github.com/dotnet/SqlClient/pull/3435),
+   [#3492](https://github.com/dotnet/SqlClient/pull/3492),
+   [#3473](https://github.com/dotnet/SqlClient/pull/3473),
+   [#3469](https://github.com/dotnet/SqlClient/pull/3469),
+   [#3394](https://github.com/dotnet/SqlClient/pull/3394),
+   [#3493](https://github.com/dotnet/SqlClient/pull/3493),
+   [#3593](https://github.com/dotnet/SqlClient/pull/3593))
+
+- Documentation improvements.
+  ([#3490](https://github.com/dotnet/SqlClient/pull/3490))
+
+- Updated `Azure.Identity` dependency to v1.14.2.
+  ([#3538](https://github.com/dotnet/SqlClient/pull/3538))
+
+## [Stable Release 6.1.1] - 2025-08-14
+
+This update includes the following changes since the [6.1.0](6.1.0.md) release:
+
+### Fixed
+
+- Reverted changes related to improving partial packet detection, fixup, and replay functionality. This revert addresses regressions introduced in 6.1.0. ([#3556](https://github.com/dotnet/SqlClient/pull/3556))
+- Applied reference assembly corrections supporting vector, fixed JSON tests, and ensured related tests are enabled. [#3562](https://github.com/dotnet/SqlClient/pull/3562)
+- Fixed `SqlVector<T>.Null` API signature in Reference assembly. [#3521](https://github.com/dotnet/SqlClient/pull/3521)
+
+### Changed
+
+- Upgraded `Azure.Identity` and other dependencies to newer versions. ([#3538](https://github.com/dotnet/SqlClient/pull/3538)) ([#3552](https://github.com/dotnet/SqlClient/pull/3552))
+
+## [Stable Release 6.1.0] - 2025-07-25
+
+This update brings the following changes since the
+[6.1.0-preview2](release-notes/6.1/6.1.0-preview2.md) release:
+
+### Added
+
+No new features were added.
+
+### Fixed
+
+- Fixed missing socket error codes on non-Windows platforms.
+  ([#3475](https://github.com/dotnet/SqlClient/pull/3475))
+- Fixed primary/secondary server SPN handling during SSPI negotiation.
+  ([#3478](https://github.com/dotnet/SqlClient/pull/3478))
+- Fixed AzureKeyVaultProvider package key caching to serialize Azure key fetch
+  operations.
+  ([#3477](https://github.com/dotnet/SqlClient/pull/3477))
+- Fixed a rare error related to multi-packet async text reads.
+  ([#3474](https://github.com/dotnet/SqlClient/pull/3474))
+- Fixed some spelling errors in the API docs.
+  ([#3500](https://github.com/dotnet/SqlClient/pull/3500))
+- Fixed a rare multi-packet string corruption bug.
+  ([#3513](https://github.com/dotnet/SqlClient/pull/3513))
+
+### Changed
+
+#### SqlDecimal type workarounds conversions
+
+*What Changed:*
+
+- Changed how SqlDecimal type workarounds perform conversions to meet
+  compliance policies.
+  ([#3467](https://github.com/dotnet/SqlClient/pull/3467))
+
+*Who Benefits:*
+
+- Microsoft products must not use undocumented APIs on other Microsoft products.
+  This change removes calls to undocumented APIs and replaces them with
+  compliant API use.
+
+*Impact:*
+
+- These changes impose an observed 5% decrease in performance on .NET Framework.
+
+#### SqlVector API improvements
+
+*What Changed:*
+
+- Several changes were made to the SqlVector API published in the
+  [6.1.0-preview2](release-notes/6.1/6.1.0-preview2.md) release
+  ([#3472](https://github.com/dotnet/SqlClient/pull/3472)):
+  - The SqlVector class was changed to a readonly struct.
+  - The null value constructor was changed to a static `CreateNull()` method.
+  - The `Size` property was removed.
+
+*Who Benefits:*
+
+- SqlVector instances gain the efficiencies of struct handling.
+
+*Impact:*
+
+- Early-adopter applications may require updates if they rely on the old APIs
+  and any class-specific behaviour.
 
 ## [Preview Release 6.1.0-preview2.25178.5] - 2025-06-27
 
-This update brings the following changes since the [6.1.0-preview1](release-notes/6.1/6.1.0-preview1.md) release:
+This update brings the following changes since the
+[6.1.0-preview1](release-notes/6.1/6.1.0-preview1.md) release:
 
 ### Added
 

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 General contribution guidance is included in this document. Additional guidance is defined in the documents linked below.
 
-- [Copyright](copyright.md) describes the licensing practices for the project.
+- [Copyright](COPYRIGHT.md) describes the licensing practices for the project.
 - [Contribution Workflow](contributing-workflow.md) describes the workflow that the team uses for considering and accepting changes.
 
 ## Up for Grabs

build.proj

@@ -58,9 +58,14 @@
     <NetStandardDriver Include="**/netcore/ref/Microsoft.Data.SqlClient*.csproj" />
     <AKVProvider Include="**/add-ons/**/AzureKeyVaultProvider/*.csproj" />
 
+    <UnitTests Include="**/Common/Common.csproj" />
+    <UnitTests Include="**/tools/TDS/TDS/TDS.csproj" />
+    <UnitTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
+    <UnitTests Include="**/tools/TDS/TDS.Servers/TDS.Servers.csproj" />
     <UnitTests Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
     <UnitTestsProj Include="**/UnitTests/Microsoft.Data.SqlClient.UnitTests.csproj" />
-    
+
+
     <FunctionalTests Include="**/Common/Common.csproj" />
     <FunctionalTests Include="**/tools/TDS/TDS/TDS.csproj" />
     <FunctionalTests Include="**/tools/TDS/TDS.EndPoint/TDS.EndPoint.csproj" />
@@ -220,6 +225,7 @@
         -p:TestTargetOS=Windows$(TargetGroup)
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
+        --filter "category!=failing%26category!=flaky"
         --logger:"trx;LogFilePrefix=Unit-Windows$(TargetGroup)-$(TestSet)"
       </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
@@ -240,8 +246,9 @@
         -p:TestTargetOS=Unixnetcoreapp
         --collect "Code coverage"
         --results-directory $(ResultsDirectory)
+        --filter "category!=failing%26category!=flaky"
         --logger:"trx;LogFilePrefix=Unit-Unixnetcoreapp-$(TestSet)"
-      </TestCommand>
+    </TestCommand>
       <TestCommand>$(TestCommand.Replace($([System.Environment]::NewLine), " "))</TestCommand>
     </PropertyGroup>
     <Message Text=">>> Running unit tests for Unix via command: $(TestCommand)"/>

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

@@ -73,9 +73,18 @@ parameters:
       - Project
       - Package
 
+  # The timeout, in minutes, for this job.
+  - name: timeout
+    type: string
+    default: 90
+
 jobs:
 - job: ${{ format('{0}', coalesce(parameters.jobDisplayName, parameters.image, 'unknown_image')) }}
 
+  # Some of our tests take longer than the default 60 minutes to run on some
+  # OSes and configurations.
+  timeoutInMinutes: ${{ parameters.timeout }}
+
   pool:
     name: '${{ parameters.poolName }}'
     ${{ if eq(parameters.hostedPool, true) }}:

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

@@ -20,11 +20,21 @@ parameters:
   - name: isPreview
     type: boolean
 
+  # The timeout, in minutes, for this job.
+  - name: timeout
+    type: string
+    default: 90
+
 jobs:
 - job: run_tests_package_reference
   displayName: 'Run tests with package reference'
   ${{ if ne(parameters.dependsOn, 'empty')}}:
     dependsOn: '${{parameters.dependsOn }}'
+
+  # Some of our tests take longer than the default 60 minutes to run on some
+  # OSes and configurations.
+  timeoutInMinutes: ${{ parameters.timeout }}
+
   pool:
     type: windows  # read more about custom job pool types at https://aka.ms/obpipelines/yaml/jobs
     isCustom: true

eng/pipelines/common/templates/stages/ci-run-tests-stage.yml

@@ -30,6 +30,11 @@ parameters:
     type: jobList
     default: []
 
+  # The timeout, in minutes, for each test job.
+  - name: testsTimeout
+    type: string
+    default: 90
+
 stages:
 - ${{ each config in parameters.testConfigurations }}:
   - ${{ each image in config.value.images }}:
@@ -47,6 +52,7 @@ stages:
                 parameters:
                   debug: ${{ parameters.debug }}
                   buildType: ${{ parameters.buildType }}
+                  timeout: ${{ parameters.testsTimeout }}
                   poolName: ${{ config.value.pool }}
                   hostedPool: ${{ eq(config.value.hostedPool, true) }}
                   image: ${{ image.value }}
@@ -72,6 +78,7 @@ stages:
                   parameters:
                     debug: ${{ parameters.debug }}
                     buildType: ${{ parameters.buildType }}
+                    timeout: ${{ parameters.testsTimeout }}
                     poolName: ${{ config.value.pool }}
                     hostedPool: ${{ eq(config.value.hostedPool, true) }}
                     image: ${{ image.value }}

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

@@ -3,6 +3,11 @@
 # The .NET Foundation licenses this file to you under the MIT license.          #
 # See the LICENSE file in the project root for more information.                #
 #################################################################################
+
+# This step configures an existing SQL Server running on the local Linux host.
+# For example, our 1ES Hosted Pool has images like ADO-UB20-SQL22 that come with
+# SQL Server 2022 pre-installed and running.
+
 parameters:
   - name: password
     type: string