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
@@ -43,6 +46,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 +158,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

.github/pull_request_template.md

@@ -14,8 +14,8 @@ High quality descriptions will lead to a smoother review experience.
 
 ## Issues
 
-Link to any relevant issues, bugs, or discussions (e.g., "Closes \#123", "Fixes
-issue \#456").
+Link to any relevant issues, bugs, or discussions (e.g., `Closes #123`, `Fixes
+issue #456`).
 
 ## Testing
 

BUILDGUIDE.md

@@ -22,12 +22,12 @@ Once the environment is setup properly, execute the desired set of commands belo
 |`BuildNetCore`|Builds the .NET driver for all target frameworks.|
 |`BuildNetCoreAllOS`|Builds the .NET driver for all target frameworks and operating systems.|
 |`BuildNetFx`|Builds the .NET Framework driver for all target frameworks.|
-|`BuildTests`|Builds tests for the .NET and .NET Framework drivers.|
 |`BuildTestsNetCore`|Builds tests for the .NET driver.|
 |`BuildTestsNetFx`|Builds tests for the .NET Framework driver.|
 |`Clean`|Cleans generated files.|
 |`Restore`|Restores Nuget packages.|
-|`RunTests`|Runs the functional and manual tests for the .NET Framework and .NET drivers|
+|`RunTests`|Runs the unit, functional, and manual tests for the .NET Framework and .NET drivers|
+|`RunUnitTests`|Runs just the unit tests for the .NET Framework and .NET drivers|
 |`RunFunctionalTests`|Runs just the functional tests for the .NET Framework and .NET drivers|
 |`RunManualTests`|Runs just the manual tests for the .NET Framework and .NET drivers|
 |`BuildAkv`|Builds the Azure Key Vault Provider package for all supported platforms.|
@@ -51,39 +51,35 @@ Using the default configuration and running all tests:
 
 ```bash
 msbuild
-msbuild -t:BuildTests
+msbuild -t:BuildTestsNetFx -p:TF=net462
+msbuild -t:BuildTestsNetCore
 msbuild -t:RunTests
 ```
 
-Targeting .NET Framework (or any specific supported version):
-
-```bash
-msbuild -p:TF=net462
-msbuild -t:BuildTests -p:TF=net462
-msbuild -t:RunTests -p:TF=net462
-```
-
 Using the Release configuration:
 
 ```bash
 msbuild -p:configuration=Release
-msbuild -t:BuildTests -p:configuration=Release
+msbuild -t:BuildTestsNetFx -p:TF=net462 -p:configuration=Release
+msbuild -t:BuildTestsNetCore -p:configuration=Release
 msbuild -t:RunTests -p:configuration=Release
 ```
 
-Running only the functional tests:
+Running only the unit tests:
 
 ```bash
 msbuild
-msbuild -t:BuildTests
-msbuild -t:RunFunctionalTests
+msbuild -t:BuildTestsNetFx -p:TF=net462
+msbuild -t:BuildTestsNetCore
+msbuild -t:RunUnitTests
 ```
 
 Using a specific dotnet version/architecture:
 
 ```bash
 msbuild -p:configuration=Release
-msbuild -t:BuildTests -p:configuration=Release
+msbuild -t:BuildTestsNetFx -p:TF=net462 -p:configuration=Release
+msbuild -t:BuildTestsNetCore -p:configuration=Release
 msbuild -t:RunTests -p:configuration=Release -p:DotnetPath=C:\net8-win-x86\
 ```
 
@@ -224,10 +220,10 @@ msbuild -t:BuildTestsNetCore -p:ReferenceType=Package
 For .NET Framework, below reference types are supported:
 
 ```bash
-msbuild -t:BuildTestsNetFx -p:ReferenceType=Project
+msbuild -t:BuildTestsNetFx -p:TF=net462 -p:ReferenceType=Project
 # Default setting uses Project Reference.
 
-msbuild -t:BuildTestsNetFx -p:ReferenceType=Package
+msbuild -t:BuildTestsNetFx -p:TF=net462 -p:ReferenceType=Package
 ```
 
 ### Running Tests with Reference Type
@@ -245,12 +241,12 @@ Tests can be built and run with custom Target Frameworks. See the below examples
 ### Building Tests with custom target framework
 
 ```bash
-msbuild -t:BuildTestsNetFx -p:TargetNetFxVersion=net462
+msbuild -t:BuildTestsNetFx -p:TF=net462
 # Build the tests for custom .NET Framework target
 ```
 
 ```bash
-msbuild -t:BuildTestsNetCore -p:TargetNetCoreVersion=net8.0
+msbuild -t:BuildTestsNetCore -p:TF=net8.0
 # Build the tests for custom .NET target
 ```
 

CHANGELOG.md

@@ -4,11 +4,151 @@ 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
+## [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