Merge main

Author: edwardneal

.editorconfig

@@ -14,6 +14,9 @@ indent_size = 4
 [*.{json,jsonc}]
 indent_size = 2
 
+[*.{yml,yaml}]
+indent_size = 2
+
 # C# files
 [*.cs]
 # New line preferences

CHANGELOG.md

@@ -4,11 +4,89 @@ 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.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

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

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

@@ -3,6 +3,10 @@
 # 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 installs the latest SQL Server 2022 onto the macOS host and
+# configures it for use.
+
 parameters:
   - name: password
     type: string
@@ -13,7 +17,7 @@ parameters:
     default: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
 
 steps:
-# Linux only steps
+# macOS only steps
 - bash: |
     # The "user" pipeline variable conflicts with homebrew, causing errors during install. Set it back to the pipeline user.
     USER=`whoami`

eng/pipelines/common/templates/steps/configure-sql-server-win-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 Windows host.
+# For example, our 1ES Hosted Pool has images like ADO-MMS22-SQL22 that come
+# with SQL Server 2022 pre-installed and running.
+
 parameters:
 # Windows only parameters
   - name: instanceName
@@ -63,7 +68,7 @@ parameters:
     default: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))
 
 steps:
-# windows only steps
+# Windows only steps
 - powershell: |
     try
     {

eng/pipelines/common/templates/steps/publish-test-results-step.yml

@@ -38,6 +38,7 @@ steps:
         TestResults/*.trx
         TestResults/**/*.coverage
       testRunTitle: 'Linux Tests'
+  condition: succeededOrFailed()
 
 - powershell: |
    cd TestResults

eng/pipelines/dotnet-sqlclient-ci-core.yml

@@ -65,10 +65,22 @@ parameters:
     - Project
     - Package
 
+- name: buildConfiguration
+  displayName: 'Build Configuration'
+  default: Release
+  values:
+    - Release
+    - Debug
+
 - name: defaultPoolName
   type: string
   default: $(ci_var_defaultPoolName)
 
+- name: enableStressTests
+  displayName: Enable Stress Tests
+  type: boolean
+  default: false
+
 variables:
   - template: libraries/ci-build-variables.yml@self
 
@@ -84,6 +96,7 @@ stages:
     jobs:
     - template: common/templates/jobs/ci-build-nugets-job.yml@self
       parameters:
+        configuration: ${{ parameters.buildConfiguration }}
         artifactName: $(artifactName)
         ${{if ne(parameters.SNIVersion, '')}}:
           prebuildSteps:
@@ -92,6 +105,16 @@ stages:
                 SNIVersion: ${{parameters.SNIVersion}}
                 SNIValidationFeed: ${{parameters.SNIValidationFeed}}
 
+  - ${{ if eq(parameters.enableStressTests, true) }}:
+    - template: stages/stress-tests-ci-stage.yml@self
+      parameters:
+        buildConfiguration: ${{ parameters.buildConfiguration }}
+        dependsOn: [build_nugets]
+        pipelineArtifactName: $(artifactName)
+        mdsPackageVersion: $(NugetPackageVersion)
+        ${{ if eq(parameters.debug, 'true') }}:
+          verbosity: 'detailed'
+    
   - template: common/templates/stages/ci-run-tests-stage.yml@self
     parameters:
       debug: ${{ parameters.debug }}
@@ -139,7 +162,6 @@ stages:
       testConfigurations:
         windows_sql_19_x64: # configuration name
           pool: ${{parameters.defaultPoolName }} # pool name
-          hostedPool: false # whether the pool is hosted or not
           images: # list of images to run tests on
             Win22_Sql19: ADO-MMS22-SQL19 # stage display name: image name from the pool
           TargetFrameworks: ${{parameters.targetFrameworks }} #[net462, net8.0] # list of target frameworks to run
@@ -181,7 +203,6 @@ stages:
 
         windows_sql_19_x86: # configuration name
           pool: ${{parameters.defaultPoolName }} # pool name
-          hostedPool: false # whether the pool is hosted or not
           images: # list of images to run tests on
             Win22_Sql19_x86: ADO-MMS22-SQL19 # stage display name: image name from the pool
           TargetFrameworks: [net8.0] #[net462, net8.0] # list of target frameworks to run

eng/pipelines/dotnet-sqlclient-ci-package-reference-pipeline.yml

@@ -81,6 +81,18 @@ parameters: # parameters are shown up in ADO UI in a build queue time
     - Project
     - Package
 
+- name: buildConfiguration
+  displayName: 'Build Configuration'
+  default: Release
+  values:
+    - Release
+    - Debug
+
+- name: enableStressTests
+  displayName: Enable Stress Tests
+  type: boolean
+  default: false
+
 extends:
   template: dotnet-sqlclient-ci-core.yml@self
   parameters:
@@ -92,3 +104,5 @@ extends:
     useManagedSNI: ${{ parameters.useManagedSNI }}
     codeCovTargetFrameworks: ${{ parameters.codeCovTargetFrameworks }}
     buildType: ${{ parameters.buildType }}
+    buildConfiguration: ${{ parameters.buildConfiguration }}
+    enableStressTests: ${{ parameters.enableStressTests }}

eng/pipelines/dotnet-sqlclient-ci-project-reference-pipeline.yml

@@ -73,6 +73,18 @@ parameters: # parameters are shown up in ADO UI in a build queue time
     - Project
     - Package
 
+- name: buildConfiguration
+  displayName: 'Build Configuration'
+  default: Release
+  values:
+    - Release
+    - Debug
+
+- name: enableStressTests
+  displayName: Enable Stress Tests
+  type: boolean
+  default: false
+
 extends:
   template: dotnet-sqlclient-ci-core.yml@self
   parameters:
@@ -84,3 +96,5 @@ extends:
     useManagedSNI: ${{ parameters.useManagedSNI }}
     codeCovTargetFrameworks: ${{ parameters.codeCovTargetFrameworks }}
     buildType: ${{ parameters.buildType }}
+    buildConfiguration: ${{ parameters.buildConfiguration }}
+    enableStressTests: ${{ parameters.enableStressTests }}